From 23fd67b5b943f40837bb6a692abdb7a2e70cf09f Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 21 Sep 2022 11:53:18 +0100 Subject: [PATCH 01/52] Ensure display columns are set --- .../server/src/api/controllers/datasource.js | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/packages/server/src/api/controllers/datasource.js b/packages/server/src/api/controllers/datasource.js index 4fafaa546c..af52be8e26 100644 --- a/packages/server/src/api/controllers/datasource.js +++ b/packages/server/src/api/controllers/datasource.js @@ -68,6 +68,7 @@ exports.buildSchemaFromDb = async function (ctx) { datasource.entities = tables } + setDefaultDisplayColumns(datasource) const dbResp = await db.put(datasource) datasource._rev = dbResp.rev @@ -78,6 +79,24 @@ exports.buildSchemaFromDb = async function (ctx) { ctx.body = response } +/** + * Make sure all datasource entities have a display name selected + */ +const setDefaultDisplayColumns = datasource => { + // + for (let entity of Object.values(datasource.entities)) { + if (entity.primaryDisplay) { + continue + } + const notAutoColumn = Object.values(entity.schema).find( + schema => !schema.autocolumn + ) + if (notAutoColumn) { + entity.primaryDisplay = notAutoColumn.name + } + } +} + /** * Check for variables that have been updated or removed and invalidate them. */ @@ -155,6 +174,7 @@ exports.save = async function (ctx) { const { tables, error } = await buildSchemaHelper(datasource) schemaError = error datasource.entities = tables + setDefaultDisplayColumns(datasource) } const dbResp = await db.put(datasource) @@ -238,19 +258,6 @@ const buildSchemaHelper = async datasource => { const connector = new Connector(datasource.config) await connector.buildSchema(datasource._id, datasource.entities) - // make sure they all have a display name selected - for (let entity of Object.values(datasource.entities ?? {})) { - if (entity.primaryDisplay) { - continue - } - const notAutoColumn = Object.values(entity.schema).find( - schema => !schema.autocolumn - ) - if (notAutoColumn) { - entity.primaryDisplay = notAutoColumn.name - } - } - const errors = connector.schemaErrors let error = null if (errors && Object.keys(errors).length > 0) { From b484f29098a3994ad0a7d40e1233994a79975d17 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 30 Sep 2022 12:30:26 +0100 Subject: [PATCH 02/52] Minor fix for #8056 - don't return the raw data for the main query execution - but still return for the builder preview. --- packages/server/src/api/controllers/query/index.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts index 187f16a573..4db33c5788 100644 --- a/packages/server/src/api/controllers/query/index.ts +++ b/packages/server/src/api/controllers/query/index.ts @@ -235,6 +235,10 @@ async function execute( }) const { rows, pagination, extra } = await quotas.addQuery(runFn) + // remove the raw from execution incase transformer being used to hide data + if (extra?.raw) { + delete extra.raw + } if (opts && opts.rowsOnly) { ctx.body = rows } else { From 3fe0a90823b533e108111b9723fae24a8a15fb69 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 3 Oct 2022 09:02:31 +0000 Subject: [PATCH 03/52] v2.0.14 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 43001d75a4..faec383b9f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.13", + "version": "2.0.14", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 5025335b32..6f740e35b6 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.13", + "version": "2.0.14", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.0.13", + "@budibase/types": "^2.0.14", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f0d298b018..191ffdf29c 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.0.13", + "version": "2.0.14", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.0.13", + "@budibase/string-templates": "^2.0.14", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 42487e0c03..ff0549fd70 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.13", + "version": "2.0.14", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.0.13", - "@budibase/client": "^2.0.13", - "@budibase/frontend-core": "^2.0.13", - "@budibase/string-templates": "^2.0.13", + "@budibase/bbui": "^2.0.14", + "@budibase/client": "^2.0.14", + "@budibase/frontend-core": "^2.0.14", + "@budibase/string-templates": "^2.0.14", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index c2c0522b2d..a7ca8555b0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.13", + "version": "2.0.14", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.0.13", - "@budibase/string-templates": "^2.0.13", - "@budibase/types": "^2.0.13", + "@budibase/backend-core": "^2.0.14", + "@budibase/string-templates": "^2.0.14", + "@budibase/types": "^2.0.14", "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 e842d15f47..d82567dcf0 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.13", + "version": "2.0.14", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.0.13", - "@budibase/frontend-core": "^2.0.13", - "@budibase/string-templates": "^2.0.13", + "@budibase/bbui": "^2.0.14", + "@budibase/frontend-core": "^2.0.14", + "@budibase/string-templates": "^2.0.14", "@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 5905ef0d96..61d1cd35ee 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.13", + "version": "2.0.14", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.0.13", + "@budibase/bbui": "^2.0.14", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0652848bf3..7a79dcec31 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.13", + "version": "2.0.14", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 94adfbdbe2..8eaa73e834 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.13", + "version": "2.0.14", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.0.13", - "@budibase/client": "^2.0.13", + "@budibase/backend-core": "^2.0.14", + "@budibase/client": "^2.0.14", "@budibase/pro": "2.0.13", - "@budibase/string-templates": "^2.0.13", - "@budibase/types": "^2.0.13", + "@budibase/string-templates": "^2.0.14", + "@budibase/types": "^2.0.14", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 59c30a4271..299deb1a54 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.13", + "version": "2.0.14", "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 586c2af7f9..04d935b877 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.13", + "version": "2.0.14", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 87a044cf2d..682e965ce7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.13", + "version": "2.0.14", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.0.13", + "@budibase/backend-core": "^2.0.14", "@budibase/pro": "2.0.13", - "@budibase/string-templates": "^2.0.13", - "@budibase/types": "^2.0.13", + "@budibase/string-templates": "^2.0.14", + "@budibase/types": "^2.0.14", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 392f9f21f60c8d68c9d5398d83af13168f26a0fb Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 3 Oct 2022 09:05:44 +0000 Subject: [PATCH 04/52] Update pro version to 2.0.14 --- 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 8eaa73e834..d82844ed00 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.0.14", "@budibase/client": "^2.0.14", - "@budibase/pro": "2.0.13", + "@budibase/pro": "2.0.14", "@budibase/string-templates": "^2.0.14", "@budibase/types": "^2.0.14", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 6cd9e67b2a..9c1a43cc44 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.13": - version "2.0.13" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.13.tgz#1746f187c79e29b535a9bfc917153a56455d0557" - integrity sha512-+C77k+qVYWrQgBzfaC1gRjw/+DGUc8V6UB48K1y+T7iJFAMfVvDgXwy8vxNh5WvIhttGuK42SdHGmMQ5J8WDxA== +"@budibase/backend-core@2.0.14": + version "2.0.14" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14.tgz#58aba2a80e96a238622a9a78af5f0237e9a1814a" + integrity sha512-FqDY8VJCu6QRjXIj6UMGzFDKq8uoo1qVl3SC83FkNY5QF8ivBadDVLT+TmyS383KVElW/6hCHJLx0bYXZHEkHQ== dependencies: - "@budibase/types" "^2.0.13" + "@budibase/types" "^2.0.14" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.13": - version "2.0.13" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.13.tgz#75dbd63eb10c20cd7226b87f9c8202bb7a289417" - integrity sha512-x8SyQXZUABT4EGL3oMJNq40wPoTbzoKv2NVleESXuCvQP5dcrqHVQJ6SaquYpLCr/tHd5Bm2Sy/b74EoG8TeLQ== +"@budibase/pro@2.0.14": + version "2.0.14" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14.tgz#96b349f52416aac36033715c024e21d1fa1ab41d" + integrity sha512-M+K8OV39wfIlBVoB9SAq/dsN+QzZM1GUkhHY9FKNIzgM39tzHZJRz2V4KdyHi4GhrdGghEGDshs4gAEru18uVA== dependencies: - "@budibase/backend-core" "2.0.13" - "@budibase/types" "2.0.13" + "@budibase/backend-core" "2.0.14" + "@budibase/types" "2.0.14" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.13", "@budibase/types@^2.0.13": - version "2.0.13" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.13.tgz#b4a8e3e60e8ed92ac78a38c1133004e5f3d37621" - integrity sha512-NVKu82oUA99PhL9W7kD5mAzWK1l2l8dBh3QenkmM69oZwE0ls/rkLggjP5dg9SQKmmC/t1eTee1j/R21lam2XA== +"@budibase/types@2.0.14", "@budibase/types@^2.0.14": + version "2.0.14" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14.tgz#762d5771723a09040391f0df71c57544d4f8079b" + integrity sha512-Jqk9QUYUShYLjcGu4VTos/X3CFhyYTVGI8KSKDYGqTIbW2lP1+GcEJUFuK46EwvLFf07RvHPk8bdNMqu54IWtw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 682e965ce7..f38c0fc821 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.0.14", - "@budibase/pro": "2.0.13", + "@budibase/pro": "2.0.14", "@budibase/string-templates": "^2.0.14", "@budibase/types": "^2.0.14", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 683cec5b62..1a0a63efc0 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.13": - version "2.0.13" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.13.tgz#1746f187c79e29b535a9bfc917153a56455d0557" - integrity sha512-+C77k+qVYWrQgBzfaC1gRjw/+DGUc8V6UB48K1y+T7iJFAMfVvDgXwy8vxNh5WvIhttGuK42SdHGmMQ5J8WDxA== +"@budibase/backend-core@2.0.14": + version "2.0.14" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14.tgz#58aba2a80e96a238622a9a78af5f0237e9a1814a" + integrity sha512-FqDY8VJCu6QRjXIj6UMGzFDKq8uoo1qVl3SC83FkNY5QF8ivBadDVLT+TmyS383KVElW/6hCHJLx0bYXZHEkHQ== dependencies: - "@budibase/types" "^2.0.13" + "@budibase/types" "^2.0.14" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.13": - version "2.0.13" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.13.tgz#75dbd63eb10c20cd7226b87f9c8202bb7a289417" - integrity sha512-x8SyQXZUABT4EGL3oMJNq40wPoTbzoKv2NVleESXuCvQP5dcrqHVQJ6SaquYpLCr/tHd5Bm2Sy/b74EoG8TeLQ== +"@budibase/pro@2.0.14": + version "2.0.14" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14.tgz#96b349f52416aac36033715c024e21d1fa1ab41d" + integrity sha512-M+K8OV39wfIlBVoB9SAq/dsN+QzZM1GUkhHY9FKNIzgM39tzHZJRz2V4KdyHi4GhrdGghEGDshs4gAEru18uVA== dependencies: - "@budibase/backend-core" "2.0.13" - "@budibase/types" "2.0.13" + "@budibase/backend-core" "2.0.14" + "@budibase/types" "2.0.14" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.13", "@budibase/types@^2.0.13": - version "2.0.13" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.13.tgz#b4a8e3e60e8ed92ac78a38c1133004e5f3d37621" - integrity sha512-NVKu82oUA99PhL9W7kD5mAzWK1l2l8dBh3QenkmM69oZwE0ls/rkLggjP5dg9SQKmmC/t1eTee1j/R21lam2XA== +"@budibase/types@2.0.14", "@budibase/types@^2.0.14": + version "2.0.14" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14.tgz#762d5771723a09040391f0df71c57544d4f8079b" + integrity sha512-Jqk9QUYUShYLjcGu4VTos/X3CFhyYTVGI8KSKDYGqTIbW2lP1+GcEJUFuK46EwvLFf07RvHPk8bdNMqu54IWtw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From fae4c9586a0c94af386f8ba05027a29b8784c564 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 3 Oct 2022 11:30:57 +0100 Subject: [PATCH 05/52] Wrap number in quotes if string search --- packages/server/src/api/controllers/row/internalSearch.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js index 3cf60fbcc0..cc82822bfd 100644 --- a/packages/server/src/api/controllers/row/internalSearch.js +++ b/packages/server/src/api/controllers/row/internalSearch.js @@ -157,8 +157,11 @@ class QueryBuilder { if (escape && originalType === "string") { value = `${value}`.replace(/[ #+\-&|!(){}\]^"~*?:\\]/g, "\\$&") } + // Wrap in quotes - if (hasVersion && wrap) { + if (originalType === "string" && !isNaN(value)) { + value = `"${value}"` + } else if (hasVersion && wrap) { value = originalType === "number" ? value : `"${value}"` } return value From 3ce821477f091dff57886672d2606d8fc88ac84c Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 3 Oct 2022 16:06:00 +0100 Subject: [PATCH 06/52] Don't cast datetime is checking (not)empty --- packages/frontend-core/src/utils/lucene.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/frontend-core/src/utils/lucene.js index 1221e20664..774ddbd834 100644 --- a/packages/frontend-core/src/utils/lucene.js +++ b/packages/frontend-core/src/utils/lucene.js @@ -121,7 +121,12 @@ export const buildLuceneQuery = filter => { query.allOr = true return } - if (type === "datetime" && !isHbs) { + if ( + type === "datetime" && + !isHbs && + operator !== "empty" && + operator !== "notEmpty" + ) { // Ensure date value is a valid date and parse into correct format if (!value) { return From a3348e3c8adec0b8ab09786856b4e967b4b5f880 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 3 Oct 2022 20:31:11 +0100 Subject: [PATCH 07/52] Fix for #6880 - allow SQL table rows to be updated/deleted by their _id field from the public API. --- packages/server/src/api/controllers/public/rows.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/public/rows.ts b/packages/server/src/api/controllers/public/rows.ts index 4daccd9542..67059ec2f5 100644 --- a/packages/server/src/api/controllers/public/rows.ts +++ b/packages/server/src/api/controllers/public/rows.ts @@ -52,14 +52,19 @@ export async function read(ctx: any, next: any) { } export async function update(ctx: any, next: any) { - ctx.request.body = await addRev(fixRow(ctx.request.body, ctx.params)) + const { tableId } = ctx.params + ctx.request.body = await addRev(fixRow(ctx.request.body, ctx.params), tableId) await rowController.save(ctx) await next() } export async function destroy(ctx: any, next: any) { + const { tableId } = ctx.params // set the body as expected, with the _id and _rev fields - ctx.request.body = await addRev(fixRow({ _id: ctx.params.rowId }, ctx.params)) + ctx.request.body = await addRev( + fixRow({ _id: ctx.params.rowId }, ctx.params), + tableId + ) await rowController.destroy(ctx) // destroy controller doesn't currently return the row as the body, need to adjust this // in the public API to be correct From 7115da91e2e8b84ec384867764604166bd39f893 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 4 Oct 2022 09:48:22 +0000 Subject: [PATCH 08/52] v2.0.15 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index faec383b9f..cba555e3b8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.14", + "version": "2.0.15", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 6f740e35b6..cf424b7956 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.14", + "version": "2.0.15", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.0.14", + "@budibase/types": "^2.0.15", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 191ffdf29c..981ff222d5 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.0.14", + "version": "2.0.15", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.0.14", + "@budibase/string-templates": "^2.0.15", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index ff0549fd70..f8633eb140 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.14", + "version": "2.0.15", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.0.14", - "@budibase/client": "^2.0.14", - "@budibase/frontend-core": "^2.0.14", - "@budibase/string-templates": "^2.0.14", + "@budibase/bbui": "^2.0.15", + "@budibase/client": "^2.0.15", + "@budibase/frontend-core": "^2.0.15", + "@budibase/string-templates": "^2.0.15", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index a7ca8555b0..c01a64b23d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.14", + "version": "2.0.15", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.0.14", - "@budibase/string-templates": "^2.0.14", - "@budibase/types": "^2.0.14", + "@budibase/backend-core": "^2.0.15", + "@budibase/string-templates": "^2.0.15", + "@budibase/types": "^2.0.15", "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 d82567dcf0..7f9bd11ee7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.14", + "version": "2.0.15", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.0.14", - "@budibase/frontend-core": "^2.0.14", - "@budibase/string-templates": "^2.0.14", + "@budibase/bbui": "^2.0.15", + "@budibase/frontend-core": "^2.0.15", + "@budibase/string-templates": "^2.0.15", "@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 61d1cd35ee..7f4ba52436 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.14", + "version": "2.0.15", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.0.14", + "@budibase/bbui": "^2.0.15", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7a79dcec31..309c303463 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.14", + "version": "2.0.15", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index d82844ed00..91a2785615 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.14", + "version": "2.0.15", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.0.14", - "@budibase/client": "^2.0.14", + "@budibase/backend-core": "^2.0.15", + "@budibase/client": "^2.0.15", "@budibase/pro": "2.0.14", - "@budibase/string-templates": "^2.0.14", - "@budibase/types": "^2.0.14", + "@budibase/string-templates": "^2.0.15", + "@budibase/types": "^2.0.15", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 299deb1a54..5a10a6139e 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.14", + "version": "2.0.15", "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 04d935b877..349506cfd9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.14", + "version": "2.0.15", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index f38c0fc821..590e3b2023 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.14", + "version": "2.0.15", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.0.14", + "@budibase/backend-core": "^2.0.15", "@budibase/pro": "2.0.14", - "@budibase/string-templates": "^2.0.14", - "@budibase/types": "^2.0.14", + "@budibase/string-templates": "^2.0.15", + "@budibase/types": "^2.0.15", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 12320276f47f3cec139d0db85c550f607e118a63 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 4 Oct 2022 09:52:40 +0000 Subject: [PATCH 09/52] Update pro version to 2.0.15 --- 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 91a2785615..898e82c1ea 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.0.15", "@budibase/client": "^2.0.15", - "@budibase/pro": "2.0.14", + "@budibase/pro": "2.0.15", "@budibase/string-templates": "^2.0.15", "@budibase/types": "^2.0.15", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 9c1a43cc44..b7f2db7790 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.14": - version "2.0.14" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14.tgz#58aba2a80e96a238622a9a78af5f0237e9a1814a" - integrity sha512-FqDY8VJCu6QRjXIj6UMGzFDKq8uoo1qVl3SC83FkNY5QF8ivBadDVLT+TmyS383KVElW/6hCHJLx0bYXZHEkHQ== +"@budibase/backend-core@2.0.15": + version "2.0.15" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.15.tgz#29193d3cc926feacbf928e3a369dd894adea5812" + integrity sha512-WKGyBZs/JkU366se/JcdHrh/T0lRb9qHx10urpy70jKmmQyvGGcKP/Ji0s4Ovb1yaidBh9anHynbIt43utiXsw== dependencies: - "@budibase/types" "^2.0.14" + "@budibase/types" "^2.0.15" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.14": - version "2.0.14" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14.tgz#96b349f52416aac36033715c024e21d1fa1ab41d" - integrity sha512-M+K8OV39wfIlBVoB9SAq/dsN+QzZM1GUkhHY9FKNIzgM39tzHZJRz2V4KdyHi4GhrdGghEGDshs4gAEru18uVA== +"@budibase/pro@2.0.15": + version "2.0.15" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.15.tgz#652c9f02c53c78a0a1956d3d7aede26fad599713" + integrity sha512-5G8vuEwcAS7qnC3VmbN2OEPA3gcEk1Q6tJEdOQqeca6m6viZpb3tnmIuaD4TNsJE3hi61YisXI6X4i0kkr+gHQ== dependencies: - "@budibase/backend-core" "2.0.14" - "@budibase/types" "2.0.14" + "@budibase/backend-core" "2.0.15" + "@budibase/types" "2.0.15" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.14", "@budibase/types@^2.0.14": - version "2.0.14" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14.tgz#762d5771723a09040391f0df71c57544d4f8079b" - integrity sha512-Jqk9QUYUShYLjcGu4VTos/X3CFhyYTVGI8KSKDYGqTIbW2lP1+GcEJUFuK46EwvLFf07RvHPk8bdNMqu54IWtw== +"@budibase/types@2.0.15", "@budibase/types@^2.0.15": + version "2.0.15" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.15.tgz#868f5207200a79a9886664d9a21bb1ab3df7dd8a" + integrity sha512-bQgfsPDs8uwUh/rstdWWLXlXXu0txS3no7jOZU9Z13fg3eB+2HsGv4biSZJRaA5LkpPH2Lb4strybdFvkQXUeg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 590e3b2023..cf8cf6d0b4 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.0.15", - "@budibase/pro": "2.0.14", + "@budibase/pro": "2.0.15", "@budibase/string-templates": "^2.0.15", "@budibase/types": "^2.0.15", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 1a0a63efc0..f0e66befad 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.14": - version "2.0.14" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14.tgz#58aba2a80e96a238622a9a78af5f0237e9a1814a" - integrity sha512-FqDY8VJCu6QRjXIj6UMGzFDKq8uoo1qVl3SC83FkNY5QF8ivBadDVLT+TmyS383KVElW/6hCHJLx0bYXZHEkHQ== +"@budibase/backend-core@2.0.15": + version "2.0.15" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.15.tgz#29193d3cc926feacbf928e3a369dd894adea5812" + integrity sha512-WKGyBZs/JkU366se/JcdHrh/T0lRb9qHx10urpy70jKmmQyvGGcKP/Ji0s4Ovb1yaidBh9anHynbIt43utiXsw== dependencies: - "@budibase/types" "^2.0.14" + "@budibase/types" "^2.0.15" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.14": - version "2.0.14" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14.tgz#96b349f52416aac36033715c024e21d1fa1ab41d" - integrity sha512-M+K8OV39wfIlBVoB9SAq/dsN+QzZM1GUkhHY9FKNIzgM39tzHZJRz2V4KdyHi4GhrdGghEGDshs4gAEru18uVA== +"@budibase/pro@2.0.15": + version "2.0.15" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.15.tgz#652c9f02c53c78a0a1956d3d7aede26fad599713" + integrity sha512-5G8vuEwcAS7qnC3VmbN2OEPA3gcEk1Q6tJEdOQqeca6m6viZpb3tnmIuaD4TNsJE3hi61YisXI6X4i0kkr+gHQ== dependencies: - "@budibase/backend-core" "2.0.14" - "@budibase/types" "2.0.14" + "@budibase/backend-core" "2.0.15" + "@budibase/types" "2.0.15" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.14", "@budibase/types@^2.0.14": - version "2.0.14" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14.tgz#762d5771723a09040391f0df71c57544d4f8079b" - integrity sha512-Jqk9QUYUShYLjcGu4VTos/X3CFhyYTVGI8KSKDYGqTIbW2lP1+GcEJUFuK46EwvLFf07RvHPk8bdNMqu54IWtw== +"@budibase/types@2.0.15", "@budibase/types@^2.0.15": + version "2.0.15" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.15.tgz#868f5207200a79a9886664d9a21bb1ab3df7dd8a" + integrity sha512-bQgfsPDs8uwUh/rstdWWLXlXXu0txS3no7jOZU9Z13fg3eB+2HsGv4biSZJRaA5LkpPH2Lb4strybdFvkQXUeg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From fdd9423b71ebf5ecf906700f55a8b7205eca163b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 4 Oct 2022 11:04:16 +0000 Subject: [PATCH 10/52] v2.0.16 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index cba555e3b8..f33aa3464d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.15", + "version": "2.0.16", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index cf424b7956..aefe63fd72 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.15", + "version": "2.0.16", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.0.15", + "@budibase/types": "^2.0.16", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 981ff222d5..bdec95aba8 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.0.15", + "version": "2.0.16", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.0.15", + "@budibase/string-templates": "^2.0.16", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index f8633eb140..4799c3dcce 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.15", + "version": "2.0.16", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.0.15", - "@budibase/client": "^2.0.15", - "@budibase/frontend-core": "^2.0.15", - "@budibase/string-templates": "^2.0.15", + "@budibase/bbui": "^2.0.16", + "@budibase/client": "^2.0.16", + "@budibase/frontend-core": "^2.0.16", + "@budibase/string-templates": "^2.0.16", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index c01a64b23d..a75228b654 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.15", + "version": "2.0.16", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.0.15", - "@budibase/string-templates": "^2.0.15", - "@budibase/types": "^2.0.15", + "@budibase/backend-core": "^2.0.16", + "@budibase/string-templates": "^2.0.16", + "@budibase/types": "^2.0.16", "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 7f9bd11ee7..4b0c8ee1c9 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.15", + "version": "2.0.16", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.0.15", - "@budibase/frontend-core": "^2.0.15", - "@budibase/string-templates": "^2.0.15", + "@budibase/bbui": "^2.0.16", + "@budibase/frontend-core": "^2.0.16", + "@budibase/string-templates": "^2.0.16", "@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 7f4ba52436..32f51998d6 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.15", + "version": "2.0.16", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.0.15", + "@budibase/bbui": "^2.0.16", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 309c303463..b199ba8774 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.15", + "version": "2.0.16", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 898e82c1ea..d27fb8162a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.15", + "version": "2.0.16", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.0.15", - "@budibase/client": "^2.0.15", + "@budibase/backend-core": "^2.0.16", + "@budibase/client": "^2.0.16", "@budibase/pro": "2.0.15", - "@budibase/string-templates": "^2.0.15", - "@budibase/types": "^2.0.15", + "@budibase/string-templates": "^2.0.16", + "@budibase/types": "^2.0.16", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 5a10a6139e..71e76fa70c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.15", + "version": "2.0.16", "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 349506cfd9..7e1b98d893 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.15", + "version": "2.0.16", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index cf8cf6d0b4..6b09a13451 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.15", + "version": "2.0.16", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.0.15", + "@budibase/backend-core": "^2.0.16", "@budibase/pro": "2.0.15", - "@budibase/string-templates": "^2.0.15", - "@budibase/types": "^2.0.15", + "@budibase/string-templates": "^2.0.16", + "@budibase/types": "^2.0.16", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 918d2130d13f64953958ec21d957badb24d192e5 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 4 Oct 2022 11:07:31 +0000 Subject: [PATCH 11/52] Update pro version to 2.0.16 --- 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 d27fb8162a..f6252da69a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.0.16", "@budibase/client": "^2.0.16", - "@budibase/pro": "2.0.15", + "@budibase/pro": "2.0.16", "@budibase/string-templates": "^2.0.16", "@budibase/types": "^2.0.16", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index b7f2db7790..98474a312f 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.15": - version "2.0.15" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.15.tgz#29193d3cc926feacbf928e3a369dd894adea5812" - integrity sha512-WKGyBZs/JkU366se/JcdHrh/T0lRb9qHx10urpy70jKmmQyvGGcKP/Ji0s4Ovb1yaidBh9anHynbIt43utiXsw== +"@budibase/backend-core@2.0.16": + version "2.0.16" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.16.tgz#425c557a694157c62c00108049b638a289540304" + integrity sha512-tzDiuIn3oxVjebwWQtDwXhg+rBoPxY3wdXWHpZE5/4RV0UbG9iSQRkzPHnAhoitO0n253BWAtMi9ip0XRkWYHQ== dependencies: - "@budibase/types" "^2.0.15" + "@budibase/types" "^2.0.16" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.15": - version "2.0.15" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.15.tgz#652c9f02c53c78a0a1956d3d7aede26fad599713" - integrity sha512-5G8vuEwcAS7qnC3VmbN2OEPA3gcEk1Q6tJEdOQqeca6m6viZpb3tnmIuaD4TNsJE3hi61YisXI6X4i0kkr+gHQ== +"@budibase/pro@2.0.16": + version "2.0.16" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.16.tgz#13f70b7990d1c95d72b6158c20b378e467f7bebf" + integrity sha512-Zo7crjm55yq4dt4q8boYFVW5o5U46FLJbTI+IZPIQGpMITPX4F5ACekAxvG4Gum1iFBkj7wuXnagKHPesr8iZw== dependencies: - "@budibase/backend-core" "2.0.15" - "@budibase/types" "2.0.15" + "@budibase/backend-core" "2.0.16" + "@budibase/types" "2.0.16" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.15", "@budibase/types@^2.0.15": - version "2.0.15" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.15.tgz#868f5207200a79a9886664d9a21bb1ab3df7dd8a" - integrity sha512-bQgfsPDs8uwUh/rstdWWLXlXXu0txS3no7jOZU9Z13fg3eB+2HsGv4biSZJRaA5LkpPH2Lb4strybdFvkQXUeg== +"@budibase/types@2.0.16", "@budibase/types@^2.0.16": + version "2.0.16" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.16.tgz#bb7e6d82dada4c01df0e92a6b59874225ecbbeb8" + integrity sha512-lmh0jp7uUlp2X45KiACbdec4RE4WaktP69c9XZb+a44tL4WbY44p1iMDyNfxbIDXrXL64Lrk9nzyaG/Y2J48mA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 6b09a13451..2e5a7e90bc 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.0.16", - "@budibase/pro": "2.0.15", + "@budibase/pro": "2.0.16", "@budibase/string-templates": "^2.0.16", "@budibase/types": "^2.0.16", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index f0e66befad..3b3026ecb8 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.15": - version "2.0.15" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.15.tgz#29193d3cc926feacbf928e3a369dd894adea5812" - integrity sha512-WKGyBZs/JkU366se/JcdHrh/T0lRb9qHx10urpy70jKmmQyvGGcKP/Ji0s4Ovb1yaidBh9anHynbIt43utiXsw== +"@budibase/backend-core@2.0.16": + version "2.0.16" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.16.tgz#425c557a694157c62c00108049b638a289540304" + integrity sha512-tzDiuIn3oxVjebwWQtDwXhg+rBoPxY3wdXWHpZE5/4RV0UbG9iSQRkzPHnAhoitO0n253BWAtMi9ip0XRkWYHQ== dependencies: - "@budibase/types" "^2.0.15" + "@budibase/types" "^2.0.16" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.15": - version "2.0.15" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.15.tgz#652c9f02c53c78a0a1956d3d7aede26fad599713" - integrity sha512-5G8vuEwcAS7qnC3VmbN2OEPA3gcEk1Q6tJEdOQqeca6m6viZpb3tnmIuaD4TNsJE3hi61YisXI6X4i0kkr+gHQ== +"@budibase/pro@2.0.16": + version "2.0.16" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.16.tgz#13f70b7990d1c95d72b6158c20b378e467f7bebf" + integrity sha512-Zo7crjm55yq4dt4q8boYFVW5o5U46FLJbTI+IZPIQGpMITPX4F5ACekAxvG4Gum1iFBkj7wuXnagKHPesr8iZw== dependencies: - "@budibase/backend-core" "2.0.15" - "@budibase/types" "2.0.15" + "@budibase/backend-core" "2.0.16" + "@budibase/types" "2.0.16" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.15", "@budibase/types@^2.0.15": - version "2.0.15" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.15.tgz#868f5207200a79a9886664d9a21bb1ab3df7dd8a" - integrity sha512-bQgfsPDs8uwUh/rstdWWLXlXXu0txS3no7jOZU9Z13fg3eB+2HsGv4biSZJRaA5LkpPH2Lb4strybdFvkQXUeg== +"@budibase/types@2.0.16", "@budibase/types@^2.0.16": + version "2.0.16" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.16.tgz#bb7e6d82dada4c01df0e92a6b59874225ecbbeb8" + integrity sha512-lmh0jp7uUlp2X45KiACbdec4RE4WaktP69c9XZb+a44tL4WbY44p1iMDyNfxbIDXrXL64Lrk9nzyaG/Y2J48mA== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 91d00ecdb401549fba09b274bf91b4bc307ead16 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 4 Oct 2022 13:55:43 +0100 Subject: [PATCH 12/52] Fix table block search --- packages/server/src/api/controllers/row/internalSearch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js index cc82822bfd..7345ec3965 100644 --- a/packages/server/src/api/controllers/row/internalSearch.js +++ b/packages/server/src/api/controllers/row/internalSearch.js @@ -159,7 +159,7 @@ class QueryBuilder { } // Wrap in quotes - if (originalType === "string" && !isNaN(value)) { + if (originalType === "string" && !isNaN(value) && !escape) { value = `"${value}"` } else if (hasVersion && wrap) { value = originalType === "number" ? value : `"${value}"` From b4ef4e528ab3f5411243bfce6f279a68a558e60e Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 4 Oct 2022 13:20:54 +0000 Subject: [PATCH 13/52] v2.0.17 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index f33aa3464d..63cf5b9b12 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.16", + "version": "2.0.17", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index aefe63fd72..58d777c915 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.16", + "version": "2.0.17", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.0.16", + "@budibase/types": "^2.0.17", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index bdec95aba8..f0900603b5 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.0.16", + "version": "2.0.17", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.0.16", + "@budibase/string-templates": "^2.0.17", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 4799c3dcce..52edb979d3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.16", + "version": "2.0.17", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.0.16", - "@budibase/client": "^2.0.16", - "@budibase/frontend-core": "^2.0.16", - "@budibase/string-templates": "^2.0.16", + "@budibase/bbui": "^2.0.17", + "@budibase/client": "^2.0.17", + "@budibase/frontend-core": "^2.0.17", + "@budibase/string-templates": "^2.0.17", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index a75228b654..51ca84db19 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.16", + "version": "2.0.17", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.0.16", - "@budibase/string-templates": "^2.0.16", - "@budibase/types": "^2.0.16", + "@budibase/backend-core": "^2.0.17", + "@budibase/string-templates": "^2.0.17", + "@budibase/types": "^2.0.17", "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 4b0c8ee1c9..195fffc6f8 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.16", + "version": "2.0.17", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.0.16", - "@budibase/frontend-core": "^2.0.16", - "@budibase/string-templates": "^2.0.16", + "@budibase/bbui": "^2.0.17", + "@budibase/frontend-core": "^2.0.17", + "@budibase/string-templates": "^2.0.17", "@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 32f51998d6..895cd506bf 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.16", + "version": "2.0.17", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.0.16", + "@budibase/bbui": "^2.0.17", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b199ba8774..d0efb323c1 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.16", + "version": "2.0.17", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index f6252da69a..cd641613b4 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.16", + "version": "2.0.17", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.0.16", - "@budibase/client": "^2.0.16", + "@budibase/backend-core": "^2.0.17", + "@budibase/client": "^2.0.17", "@budibase/pro": "2.0.16", - "@budibase/string-templates": "^2.0.16", - "@budibase/types": "^2.0.16", + "@budibase/string-templates": "^2.0.17", + "@budibase/types": "^2.0.17", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 71e76fa70c..86acfb4131 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.16", + "version": "2.0.17", "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 7e1b98d893..31ae0fe719 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.16", + "version": "2.0.17", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 2e5a7e90bc..d0c6dce82f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.16", + "version": "2.0.17", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.0.16", + "@budibase/backend-core": "^2.0.17", "@budibase/pro": "2.0.16", - "@budibase/string-templates": "^2.0.16", - "@budibase/types": "^2.0.16", + "@budibase/string-templates": "^2.0.17", + "@budibase/types": "^2.0.17", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From daf1f7177375d5423a1543fc222339d5251ed857 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 4 Oct 2022 13:24:09 +0000 Subject: [PATCH 14/52] Update pro version to 2.0.17 --- 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 cd641613b4..69583ac6e8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.0.17", "@budibase/client": "^2.0.17", - "@budibase/pro": "2.0.16", + "@budibase/pro": "2.0.17", "@budibase/string-templates": "^2.0.17", "@budibase/types": "^2.0.17", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 98474a312f..d8811db387 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.16": - version "2.0.16" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.16.tgz#425c557a694157c62c00108049b638a289540304" - integrity sha512-tzDiuIn3oxVjebwWQtDwXhg+rBoPxY3wdXWHpZE5/4RV0UbG9iSQRkzPHnAhoitO0n253BWAtMi9ip0XRkWYHQ== +"@budibase/backend-core@2.0.17": + version "2.0.17" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.17.tgz#5c95250a483a4fa802e8a796f3a821b8aee1f263" + integrity sha512-AVzDmN2slN1FT+rzwrwG61cGe80/tQPFlWXl8nhwZWbRCQAPazMdKSJVRm2t9E1Ii3AaEYnWq0PlvMs1hhj85g== dependencies: - "@budibase/types" "^2.0.16" + "@budibase/types" "^2.0.17" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.16": - version "2.0.16" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.16.tgz#13f70b7990d1c95d72b6158c20b378e467f7bebf" - integrity sha512-Zo7crjm55yq4dt4q8boYFVW5o5U46FLJbTI+IZPIQGpMITPX4F5ACekAxvG4Gum1iFBkj7wuXnagKHPesr8iZw== +"@budibase/pro@2.0.17": + version "2.0.17" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.17.tgz#41b90169d89a3b7d17faf68ca936ec10c7111df4" + integrity sha512-HzT5f3L+BXZMWiy7gqowk2Z/PUaG7rIVWDNbM3MDJWfGyfMQmfogHD2qcWGN6kSlyM3BwhSOUA2WpQhTa1svXg== dependencies: - "@budibase/backend-core" "2.0.16" - "@budibase/types" "2.0.16" + "@budibase/backend-core" "2.0.17" + "@budibase/types" "2.0.17" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.16", "@budibase/types@^2.0.16": - version "2.0.16" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.16.tgz#bb7e6d82dada4c01df0e92a6b59874225ecbbeb8" - integrity sha512-lmh0jp7uUlp2X45KiACbdec4RE4WaktP69c9XZb+a44tL4WbY44p1iMDyNfxbIDXrXL64Lrk9nzyaG/Y2J48mA== +"@budibase/types@2.0.17", "@budibase/types@^2.0.17": + version "2.0.17" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.17.tgz#8805de34e86a84966856767d14fd9898979ae171" + integrity sha512-/Y3UUrkKRMuOAdt3Qzyx/wflFTBVV1suOSjdVwvTjOOg2Bx5iUKsKsVunZkQKXcZnNpxPwaUQGCJYQuZKVb9uw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index d0c6dce82f..9daca191db 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.0.17", - "@budibase/pro": "2.0.16", + "@budibase/pro": "2.0.17", "@budibase/string-templates": "^2.0.17", "@budibase/types": "^2.0.17", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 3b3026ecb8..d81f8bcf95 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.16": - version "2.0.16" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.16.tgz#425c557a694157c62c00108049b638a289540304" - integrity sha512-tzDiuIn3oxVjebwWQtDwXhg+rBoPxY3wdXWHpZE5/4RV0UbG9iSQRkzPHnAhoitO0n253BWAtMi9ip0XRkWYHQ== +"@budibase/backend-core@2.0.17": + version "2.0.17" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.17.tgz#5c95250a483a4fa802e8a796f3a821b8aee1f263" + integrity sha512-AVzDmN2slN1FT+rzwrwG61cGe80/tQPFlWXl8nhwZWbRCQAPazMdKSJVRm2t9E1Ii3AaEYnWq0PlvMs1hhj85g== dependencies: - "@budibase/types" "^2.0.16" + "@budibase/types" "^2.0.17" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.16": - version "2.0.16" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.16.tgz#13f70b7990d1c95d72b6158c20b378e467f7bebf" - integrity sha512-Zo7crjm55yq4dt4q8boYFVW5o5U46FLJbTI+IZPIQGpMITPX4F5ACekAxvG4Gum1iFBkj7wuXnagKHPesr8iZw== +"@budibase/pro@2.0.17": + version "2.0.17" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.17.tgz#41b90169d89a3b7d17faf68ca936ec10c7111df4" + integrity sha512-HzT5f3L+BXZMWiy7gqowk2Z/PUaG7rIVWDNbM3MDJWfGyfMQmfogHD2qcWGN6kSlyM3BwhSOUA2WpQhTa1svXg== dependencies: - "@budibase/backend-core" "2.0.16" - "@budibase/types" "2.0.16" + "@budibase/backend-core" "2.0.17" + "@budibase/types" "2.0.17" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.16", "@budibase/types@^2.0.16": - version "2.0.16" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.16.tgz#bb7e6d82dada4c01df0e92a6b59874225ecbbeb8" - integrity sha512-lmh0jp7uUlp2X45KiACbdec4RE4WaktP69c9XZb+a44tL4WbY44p1iMDyNfxbIDXrXL64Lrk9nzyaG/Y2J48mA== +"@budibase/types@2.0.17", "@budibase/types@^2.0.17": + version "2.0.17" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.17.tgz#8805de34e86a84966856767d14fd9898979ae171" + integrity sha512-/Y3UUrkKRMuOAdt3Qzyx/wflFTBVV1suOSjdVwvTjOOg2Bx5iUKsKsVunZkQKXcZnNpxPwaUQGCJYQuZKVb9uw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 95ff0d966564c5515ac4b11cdfa40fa11aeeba42 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 4 Oct 2022 14:50:21 +0100 Subject: [PATCH 15/52] Fallback --- scripts/pro/install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/pro/install.sh b/scripts/pro/install.sh index 6a388dc190..781ecd8caa 100755 --- a/scripts/pro/install.sh +++ b/scripts/pro/install.sh @@ -18,6 +18,10 @@ git clone https://$PERSONAL_ACCESS_TOKEN@github.com/Budibase/budibase-pro.git if [[ -d "budibase-pro" ]]; then cd budibase-pro + if [[ -z "${BRANCH}" ]]; then + export BRANCH=$GITHUB_REF_NAME + fi + # Try to checkout the matching pro branch git checkout $BRANCH From 43c8bfffedfa22a57c0731c7d114c1d4fd75bd49 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 4 Oct 2022 14:56:30 +0100 Subject: [PATCH 16/52] Update scripts/pro/install.sh --- scripts/pro/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/pro/install.sh b/scripts/pro/install.sh index 781ecd8caa..212f5b5a39 100755 --- a/scripts/pro/install.sh +++ b/scripts/pro/install.sh @@ -19,6 +19,7 @@ if [[ -d "budibase-pro" ]]; then cd budibase-pro if [[ -z "${BRANCH}" ]]; then + echo Using GITHUB_REF_NAME: $GITHUB_REF_NAME export BRANCH=$GITHUB_REF_NAME fi From c986fb164e19822515cdd11c1daf343917ac4e30 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 4 Oct 2022 15:01:18 +0100 Subject: [PATCH 17/52] Use raw server jsUrl when rendering plugins --- packages/client/src/components/ClientApp.svelte | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index ab19e91038..537e963ff3 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -16,7 +16,6 @@ themeStore, appStore, devToolsStore, - environmentStore, } from "stores" import NotificationDisplay from "components/overlay/NotificationDisplay.svelte" import ConfirmationDisplay from "components/overlay/ConfirmationDisplay.svelte" @@ -48,8 +47,6 @@ !$builderStore.inBuilder && $devToolsStore.enabled && !$routeStore.queryParams?.peek - $: objectStoreUrl = $environmentStore.cloud ? "https://cdn.budi.live" : "" - $: pluginsUrl = `${objectStoreUrl}/plugins` // Handle no matching route $: { @@ -95,8 +92,7 @@ {#if $builderStore.usedPlugins?.length} {#each $builderStore.usedPlugins as plugin (plugin.hash)} - + {/each} {/if} From 14552dce87923d08a8583f4c4fb550286c580a0d Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 4 Oct 2022 14:10:26 +0000 Subject: [PATCH 18/52] v2.0.18 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 63cf5b9b12..0d8370ed53 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.17", + "version": "2.0.18", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 58d777c915..32b67ba5a7 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.17", + "version": "2.0.18", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.0.17", + "@budibase/types": "^2.0.18", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f0900603b5..166e68ec4b 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.0.17", + "version": "2.0.18", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.0.17", + "@budibase/string-templates": "^2.0.18", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 52edb979d3..267cf5bb33 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.17", + "version": "2.0.18", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.0.17", - "@budibase/client": "^2.0.17", - "@budibase/frontend-core": "^2.0.17", - "@budibase/string-templates": "^2.0.17", + "@budibase/bbui": "^2.0.18", + "@budibase/client": "^2.0.18", + "@budibase/frontend-core": "^2.0.18", + "@budibase/string-templates": "^2.0.18", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 51ca84db19..06f93f1565 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.17", + "version": "2.0.18", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.0.17", - "@budibase/string-templates": "^2.0.17", - "@budibase/types": "^2.0.17", + "@budibase/backend-core": "^2.0.18", + "@budibase/string-templates": "^2.0.18", + "@budibase/types": "^2.0.18", "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 195fffc6f8..d87769196a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.17", + "version": "2.0.18", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.0.17", - "@budibase/frontend-core": "^2.0.17", - "@budibase/string-templates": "^2.0.17", + "@budibase/bbui": "^2.0.18", + "@budibase/frontend-core": "^2.0.18", + "@budibase/string-templates": "^2.0.18", "@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 895cd506bf..956d289eb3 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.17", + "version": "2.0.18", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.0.17", + "@budibase/bbui": "^2.0.18", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index d0efb323c1..982e9d9e5c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.17", + "version": "2.0.18", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 69583ac6e8..aa884f3eb2 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.17", + "version": "2.0.18", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.0.17", - "@budibase/client": "^2.0.17", + "@budibase/backend-core": "^2.0.18", + "@budibase/client": "^2.0.18", "@budibase/pro": "2.0.17", - "@budibase/string-templates": "^2.0.17", - "@budibase/types": "^2.0.17", + "@budibase/string-templates": "^2.0.18", + "@budibase/types": "^2.0.18", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 86acfb4131..880623836f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.17", + "version": "2.0.18", "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 31ae0fe719..c8eb7a3430 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.17", + "version": "2.0.18", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 9daca191db..6d930d9148 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.17", + "version": "2.0.18", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.0.17", + "@budibase/backend-core": "^2.0.18", "@budibase/pro": "2.0.17", - "@budibase/string-templates": "^2.0.17", - "@budibase/types": "^2.0.17", + "@budibase/string-templates": "^2.0.18", + "@budibase/types": "^2.0.18", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d8e95a458825298a49c6c7c3284a9c8a24595481 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 4 Oct 2022 14:13:53 +0000 Subject: [PATCH 19/52] Update pro version to 2.0.18 --- 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 aa884f3eb2..6224579efc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.0.18", "@budibase/client": "^2.0.18", - "@budibase/pro": "2.0.17", + "@budibase/pro": "2.0.18", "@budibase/string-templates": "^2.0.18", "@budibase/types": "^2.0.18", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index d8811db387..15946de219 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.17": - version "2.0.17" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.17.tgz#5c95250a483a4fa802e8a796f3a821b8aee1f263" - integrity sha512-AVzDmN2slN1FT+rzwrwG61cGe80/tQPFlWXl8nhwZWbRCQAPazMdKSJVRm2t9E1Ii3AaEYnWq0PlvMs1hhj85g== +"@budibase/backend-core@2.0.18": + version "2.0.18" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.18.tgz#229c4f6300d44a35aa12ce9eb1227f1dbc2ccae4" + integrity sha512-AIP2xp6nTykTL6KtZB0NxvPHC93Rwq/+UL+jCmb7JPmM5zW10zmuBd0vAOQP1LJHAVWS1BYSW26hcAqMTv6yjg== dependencies: - "@budibase/types" "^2.0.17" + "@budibase/types" "^2.0.18" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.17": - version "2.0.17" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.17.tgz#41b90169d89a3b7d17faf68ca936ec10c7111df4" - integrity sha512-HzT5f3L+BXZMWiy7gqowk2Z/PUaG7rIVWDNbM3MDJWfGyfMQmfogHD2qcWGN6kSlyM3BwhSOUA2WpQhTa1svXg== +"@budibase/pro@2.0.18": + version "2.0.18" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.18.tgz#695abb5dcb6b3514da64b19f078b9610ba19826b" + integrity sha512-yiCAQJ23j8a6810KMzQjfeKmZ6PtcOS9z+3A3XKQEaj5LUFFN0OAT+9hTtP3e6orDf2AOj3p2aBmN4C+DrkjmQ== dependencies: - "@budibase/backend-core" "2.0.17" - "@budibase/types" "2.0.17" + "@budibase/backend-core" "2.0.18" + "@budibase/types" "2.0.18" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.17", "@budibase/types@^2.0.17": - version "2.0.17" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.17.tgz#8805de34e86a84966856767d14fd9898979ae171" - integrity sha512-/Y3UUrkKRMuOAdt3Qzyx/wflFTBVV1suOSjdVwvTjOOg2Bx5iUKsKsVunZkQKXcZnNpxPwaUQGCJYQuZKVb9uw== +"@budibase/types@2.0.18", "@budibase/types@^2.0.18": + version "2.0.18" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.18.tgz#571e8ee67ba0769b85724af55b8f9909c48ab486" + integrity sha512-26Qs8W30SFh4rebxA2cwCjUzzJfQOsjyWTDFpIOScJ2B0gkcMRW5FxxF29U0GfE5lPKHDPLlrZ8e3DBLVgAPlw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 6d930d9148..f1484358c5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.0.18", - "@budibase/pro": "2.0.17", + "@budibase/pro": "2.0.18", "@budibase/string-templates": "^2.0.18", "@budibase/types": "^2.0.18", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index d81f8bcf95..e03a490279 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.17": - version "2.0.17" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.17.tgz#5c95250a483a4fa802e8a796f3a821b8aee1f263" - integrity sha512-AVzDmN2slN1FT+rzwrwG61cGe80/tQPFlWXl8nhwZWbRCQAPazMdKSJVRm2t9E1Ii3AaEYnWq0PlvMs1hhj85g== +"@budibase/backend-core@2.0.18": + version "2.0.18" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.18.tgz#229c4f6300d44a35aa12ce9eb1227f1dbc2ccae4" + integrity sha512-AIP2xp6nTykTL6KtZB0NxvPHC93Rwq/+UL+jCmb7JPmM5zW10zmuBd0vAOQP1LJHAVWS1BYSW26hcAqMTv6yjg== dependencies: - "@budibase/types" "^2.0.17" + "@budibase/types" "^2.0.18" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.17": - version "2.0.17" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.17.tgz#41b90169d89a3b7d17faf68ca936ec10c7111df4" - integrity sha512-HzT5f3L+BXZMWiy7gqowk2Z/PUaG7rIVWDNbM3MDJWfGyfMQmfogHD2qcWGN6kSlyM3BwhSOUA2WpQhTa1svXg== +"@budibase/pro@2.0.18": + version "2.0.18" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.18.tgz#695abb5dcb6b3514da64b19f078b9610ba19826b" + integrity sha512-yiCAQJ23j8a6810KMzQjfeKmZ6PtcOS9z+3A3XKQEaj5LUFFN0OAT+9hTtP3e6orDf2AOj3p2aBmN4C+DrkjmQ== dependencies: - "@budibase/backend-core" "2.0.17" - "@budibase/types" "2.0.17" + "@budibase/backend-core" "2.0.18" + "@budibase/types" "2.0.18" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.17", "@budibase/types@^2.0.17": - version "2.0.17" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.17.tgz#8805de34e86a84966856767d14fd9898979ae171" - integrity sha512-/Y3UUrkKRMuOAdt3Qzyx/wflFTBVV1suOSjdVwvTjOOg2Bx5iUKsKsVunZkQKXcZnNpxPwaUQGCJYQuZKVb9uw== +"@budibase/types@2.0.18", "@budibase/types@^2.0.18": + version "2.0.18" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.18.tgz#571e8ee67ba0769b85724af55b8f9909c48ab486" + integrity sha512-26Qs8W30SFh4rebxA2cwCjUzzJfQOsjyWTDFpIOScJ2B0gkcMRW5FxxF29U0GfE5lPKHDPLlrZ8e3DBLVgAPlw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From de9b2c44cb27e5890ddfaf2d42bcd372a7d81473 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 4 Oct 2022 16:27:04 +0100 Subject: [PATCH 20/52] Add utility for generating plugin JS URLs --- packages/server/src/utilities/plugins.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/server/src/utilities/plugins.js diff --git a/packages/server/src/utilities/plugins.js b/packages/server/src/utilities/plugins.js new file mode 100644 index 0000000000..e69de29bb2 From 69988aabc38bddd7d7d2f4b6b87d4ecd2b97448c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 4 Oct 2022 16:27:15 +0100 Subject: [PATCH 21/52] Always use the raw server plugin JS URL --- packages/client/src/components/ClientApp.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index 537e963ff3..47f6cc2e3e 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -87,6 +87,8 @@ builderStore.actions.analyticsPing({ source: "app" }) } }) + + $: console.log($builderStore.usedPlugins) From b148b7d004a1bc14f40b1416e970e18cbe11258e Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 4 Oct 2022 16:27:42 +0100 Subject: [PATCH 22/52] Enrich plugin JS URLs when fetching appPackage --- packages/server/src/api/controllers/application.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index 6771f7e4e0..b6377a61a2 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -50,6 +50,7 @@ import { errors, events, migrations } from "@budibase/backend-core" import { App, Layout, Screen, MigrationType } from "@budibase/types" import { BASE_LAYOUT_PROP_IDS } from "../../constants/layouts" import { groups } from "@budibase/pro" +import { enrichPluginURLs } from "../../utilities/plugins" const URL_REGEX_SLASH = /\/|\\/g @@ -208,10 +209,13 @@ export const fetchAppDefinition = async (ctx: any) => { export const fetchAppPackage = async (ctx: any) => { const db = context.getAppDB() - const application = await db.get(DocumentType.APP_METADATA) + let application = await db.get(DocumentType.APP_METADATA) const layouts = await getLayouts() let screens = await getScreens() + // Enrich plugin URLs + application.usedPlugins = enrichPluginURLs(application.usedPlugins) + // Only filter screens if the user is not a builder if (!(ctx.user.builder && ctx.user.builder.global)) { const userRoleId = getUserRoleId(ctx) From d5cde049a7bf089a866dfd1aaf2dcdc67b8b92bf Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 4 Oct 2022 16:28:01 +0100 Subject: [PATCH 23/52] Enrich plugin JS URLs when SSR'ing apps --- packages/server/src/api/controllers/static/index.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts index 80116a21f5..83f2b6fdc4 100644 --- a/packages/server/src/api/controllers/static/index.ts +++ b/packages/server/src/api/controllers/static/index.ts @@ -1,3 +1,6 @@ +import { Plugin } from "@budibase/types" +import { enrichPluginURLs } from "../../../utilities/plugins" + require("svelte/register") const send = require("koa-send") @@ -22,6 +25,7 @@ const fs = require("fs") const { downloadTarballDirect, } = require("../../../utilities/fileSystem/utilities") +const { isMultiTenant } = require("@budibase/backend-core/tenancy") async function prepareUpload({ s3Key, bucket, metadata, file }: any) { const response = await upload({ @@ -107,12 +111,13 @@ export const serveApp = async function (ctx: any) { if (!env.isJest()) { const App = require("./templates/BudibaseApp.svelte").default + const plugins = enrichPluginURLs(appInfo.usedPlugins) const { head, html, css } = App.render({ title: appInfo.name, production: env.isProd(), appId, clientLibPath: clientLibraryPath(appId, appInfo.version, ctx), - usedPlugins: appInfo.usedPlugins, + usedPlugins: plugins, }) const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`) From b487855348153811e7101d7ff469db5f053bc592 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 4 Oct 2022 16:28:21 +0100 Subject: [PATCH 24/52] Update plugin JS URL handling --- .../static/templates/BudibaseApp.svelte | 4 +--- packages/server/src/utilities/plugins.js | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte b/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte index 4bf54f2c91..227f980896 100644 --- a/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte +++ b/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte @@ -88,9 +88,7 @@ {#if usedPlugins?.length} {#each usedPlugins as plugin} - + {/each} {/if} From 021316c73f6939bb50493073948d55c80be1a13e Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 4 Oct 2022 16:43:20 +0100 Subject: [PATCH 27/52] Lint --- packages/server/src/api/controllers/static/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts index 83f2b6fdc4..08213c2cf8 100644 --- a/packages/server/src/api/controllers/static/index.ts +++ b/packages/server/src/api/controllers/static/index.ts @@ -1,4 +1,3 @@ -import { Plugin } from "@budibase/types" import { enrichPluginURLs } from "../../../utilities/plugins" require("svelte/register") @@ -25,7 +24,6 @@ const fs = require("fs") const { downloadTarballDirect, } = require("../../../utilities/fileSystem/utilities") -const { isMultiTenant } = require("@budibase/backend-core/tenancy") async function prepareUpload({ s3Key, bucket, metadata, file }: any) { const response = await upload({ From 1dabc59ff518860c1f3211067bbc22df7b0ceeb9 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 4 Oct 2022 17:54:33 +0100 Subject: [PATCH 28/52] Fixing a regression of CSV table creation - normally if a CSV was used to create a table with an options column all of the options would be filled in but this had been broken. --- packages/server/src/api/controllers/public/utils.ts | 2 +- .../server/src/api/controllers/table/internal.ts | 12 ++++++++++-- packages/server/src/api/controllers/table/utils.ts | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/server/src/api/controllers/public/utils.ts b/packages/server/src/api/controllers/public/utils.ts index d86eced9ba..6909db9628 100644 --- a/packages/server/src/api/controllers/public/utils.ts +++ b/packages/server/src/api/controllers/public/utils.ts @@ -22,7 +22,7 @@ export async function addRev( } /** - * Performs a case insensitive search on the provided documents, using the + * Performs a case in-sensitive search on the provided documents, using the * provided key and value. This will be a string based search, using the * startsWith function. */ diff --git a/packages/server/src/api/controllers/table/internal.ts b/packages/server/src/api/controllers/table/internal.ts index 03e2cc056c..71f6fb5224 100644 --- a/packages/server/src/api/controllers/table/internal.ts +++ b/packages/server/src/api/controllers/table/internal.ts @@ -14,8 +14,10 @@ import { fixAutoColumnSubType, } from "../../../utilities/rowProcessor" import { runStaticFormulaChecks } from "./bulkFormula" -import { Table } from "../../../definitions/common" +import { Table } from "@budibase/types" import { quotas } from "@budibase/pro" +import { isEqual } from "lodash" +import { cloneDeep } from "lodash/fp" function checkAutoColumns(table: Table, oldTable: Table) { if (!table.schema) { @@ -123,10 +125,16 @@ export async function save(ctx: any) { if (updatedRows && updatedRows.length !== 0) { await db.bulkDocs(updatedRows) } - const result = await db.put(tableToSave) + let result = await db.put(tableToSave) tableToSave._rev = result.rev + const savedTable = cloneDeep(tableToSave) tableToSave = await tableSaveFunctions.after(tableToSave) + // the table may be updated as part of the table save after functionality - need to write it + if (!isEqual(savedTable, tableToSave)) { + result = await db.put(tableToSave) + tableToSave._rev = result.rev + } // has to run after, make sure it has _id await runStaticFormulaChecks(tableToSave, { oldTable, deletion: null }) return tableToSave diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts index 896221dddf..cbad2afea5 100644 --- a/packages/server/src/api/controllers/table/utils.ts +++ b/packages/server/src/api/controllers/table/utils.ts @@ -245,7 +245,7 @@ class TableSaveFunctions { // after saving async after(table: any) { table = await handleSearchIndexes(table) - await handleDataImport(this.user, table, this.dataImport) + table = await handleDataImport(this.user, table, this.dataImport) return table } From a3cbb85dce193dfcb2dd198aaa0253467611d5d7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 4 Oct 2022 16:57:55 +0000 Subject: [PATCH 29/52] v2.0.19 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 0d8370ed53..1b81e62403 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.18", + "version": "2.0.19", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 32b67ba5a7..fd98bd5f75 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.18", + "version": "2.0.19", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.0.18", + "@budibase/types": "^2.0.19", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 166e68ec4b..6e5924d30a 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.0.18", + "version": "2.0.19", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.0.18", + "@budibase/string-templates": "^2.0.19", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 267cf5bb33..e2ce507f15 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.18", + "version": "2.0.19", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.0.18", - "@budibase/client": "^2.0.18", - "@budibase/frontend-core": "^2.0.18", - "@budibase/string-templates": "^2.0.18", + "@budibase/bbui": "^2.0.19", + "@budibase/client": "^2.0.19", + "@budibase/frontend-core": "^2.0.19", + "@budibase/string-templates": "^2.0.19", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 06f93f1565..4d52b8f6f0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.18", + "version": "2.0.19", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.0.18", - "@budibase/string-templates": "^2.0.18", - "@budibase/types": "^2.0.18", + "@budibase/backend-core": "^2.0.19", + "@budibase/string-templates": "^2.0.19", + "@budibase/types": "^2.0.19", "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 d87769196a..985fc34814 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.18", + "version": "2.0.19", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.0.18", - "@budibase/frontend-core": "^2.0.18", - "@budibase/string-templates": "^2.0.18", + "@budibase/bbui": "^2.0.19", + "@budibase/frontend-core": "^2.0.19", + "@budibase/string-templates": "^2.0.19", "@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 956d289eb3..ff469ad662 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.18", + "version": "2.0.19", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.0.18", + "@budibase/bbui": "^2.0.19", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 982e9d9e5c..2cb3b00a4d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.18", + "version": "2.0.19", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 6224579efc..7296acc889 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.18", + "version": "2.0.19", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.0.18", - "@budibase/client": "^2.0.18", + "@budibase/backend-core": "^2.0.19", + "@budibase/client": "^2.0.19", "@budibase/pro": "2.0.18", - "@budibase/string-templates": "^2.0.18", - "@budibase/types": "^2.0.18", + "@budibase/string-templates": "^2.0.19", + "@budibase/types": "^2.0.19", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 880623836f..5aaad0f597 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.18", + "version": "2.0.19", "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 c8eb7a3430..9f89aa3947 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.18", + "version": "2.0.19", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index f1484358c5..8743f8280f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.18", + "version": "2.0.19", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.0.18", + "@budibase/backend-core": "^2.0.19", "@budibase/pro": "2.0.18", - "@budibase/string-templates": "^2.0.18", - "@budibase/types": "^2.0.18", + "@budibase/string-templates": "^2.0.19", + "@budibase/types": "^2.0.19", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From c3b5ef7ebe72902ab3fb659efd92f1f3ae9a14d9 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 4 Oct 2022 17:01:32 +0000 Subject: [PATCH 30/52] Update pro version to 2.0.19 --- 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 7296acc889..38e1f273e2 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.0.19", "@budibase/client": "^2.0.19", - "@budibase/pro": "2.0.18", + "@budibase/pro": "2.0.19", "@budibase/string-templates": "^2.0.19", "@budibase/types": "^2.0.19", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 15946de219..b7ae45ebd2 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.18": - version "2.0.18" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.18.tgz#229c4f6300d44a35aa12ce9eb1227f1dbc2ccae4" - integrity sha512-AIP2xp6nTykTL6KtZB0NxvPHC93Rwq/+UL+jCmb7JPmM5zW10zmuBd0vAOQP1LJHAVWS1BYSW26hcAqMTv6yjg== +"@budibase/backend-core@2.0.19": + version "2.0.19" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.19.tgz#21c2f53e8377034f289e2b1e5854b5b25df39c33" + integrity sha512-IPNRIpgbBu0Rn1HGYdqGZOZnW4qMCC6SWdB7cwGq79On3+O5xN6m+FUJ4lEh+YE02GT4CnTWFvARWgwpEuE0ig== dependencies: - "@budibase/types" "^2.0.18" + "@budibase/types" "^2.0.19" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.18": - version "2.0.18" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.18.tgz#695abb5dcb6b3514da64b19f078b9610ba19826b" - integrity sha512-yiCAQJ23j8a6810KMzQjfeKmZ6PtcOS9z+3A3XKQEaj5LUFFN0OAT+9hTtP3e6orDf2AOj3p2aBmN4C+DrkjmQ== +"@budibase/pro@2.0.19": + version "2.0.19" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.19.tgz#2d7f00dec028c3cde0bafae10721c68ffa1e45bb" + integrity sha512-O7jDcjMgPmnZtn5Db+dnhjXF0m1NwWtrE9yanU3FjJpgE4lHzF8O1R08WyLUuCgUcJ6+DETLa9DZmDkj/9xh8g== dependencies: - "@budibase/backend-core" "2.0.18" - "@budibase/types" "2.0.18" + "@budibase/backend-core" "2.0.19" + "@budibase/types" "2.0.19" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.18", "@budibase/types@^2.0.18": - version "2.0.18" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.18.tgz#571e8ee67ba0769b85724af55b8f9909c48ab486" - integrity sha512-26Qs8W30SFh4rebxA2cwCjUzzJfQOsjyWTDFpIOScJ2B0gkcMRW5FxxF29U0GfE5lPKHDPLlrZ8e3DBLVgAPlw== +"@budibase/types@2.0.19", "@budibase/types@^2.0.19": + version "2.0.19" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.19.tgz#a2b12d47ee1e843cf18d354cfa7ce0040c8c7103" + integrity sha512-vBpJ+GwMS9GPKJPxAa7nN2QYy8ThH3j1SAaj8bemJEheYvsFzXT0ueovphJ44Mx9kL8EAbk4T++xrUMIk/xtnQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 8743f8280f..43a4165439 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.0.19", - "@budibase/pro": "2.0.18", + "@budibase/pro": "2.0.19", "@budibase/string-templates": "^2.0.19", "@budibase/types": "^2.0.19", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index e03a490279..a4a08e4ee8 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.18": - version "2.0.18" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.18.tgz#229c4f6300d44a35aa12ce9eb1227f1dbc2ccae4" - integrity sha512-AIP2xp6nTykTL6KtZB0NxvPHC93Rwq/+UL+jCmb7JPmM5zW10zmuBd0vAOQP1LJHAVWS1BYSW26hcAqMTv6yjg== +"@budibase/backend-core@2.0.19": + version "2.0.19" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.19.tgz#21c2f53e8377034f289e2b1e5854b5b25df39c33" + integrity sha512-IPNRIpgbBu0Rn1HGYdqGZOZnW4qMCC6SWdB7cwGq79On3+O5xN6m+FUJ4lEh+YE02GT4CnTWFvARWgwpEuE0ig== dependencies: - "@budibase/types" "^2.0.18" + "@budibase/types" "^2.0.19" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.18": - version "2.0.18" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.18.tgz#695abb5dcb6b3514da64b19f078b9610ba19826b" - integrity sha512-yiCAQJ23j8a6810KMzQjfeKmZ6PtcOS9z+3A3XKQEaj5LUFFN0OAT+9hTtP3e6orDf2AOj3p2aBmN4C+DrkjmQ== +"@budibase/pro@2.0.19": + version "2.0.19" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.19.tgz#2d7f00dec028c3cde0bafae10721c68ffa1e45bb" + integrity sha512-O7jDcjMgPmnZtn5Db+dnhjXF0m1NwWtrE9yanU3FjJpgE4lHzF8O1R08WyLUuCgUcJ6+DETLa9DZmDkj/9xh8g== dependencies: - "@budibase/backend-core" "2.0.18" - "@budibase/types" "2.0.18" + "@budibase/backend-core" "2.0.19" + "@budibase/types" "2.0.19" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.18", "@budibase/types@^2.0.18": - version "2.0.18" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.18.tgz#571e8ee67ba0769b85724af55b8f9909c48ab486" - integrity sha512-26Qs8W30SFh4rebxA2cwCjUzzJfQOsjyWTDFpIOScJ2B0gkcMRW5FxxF29U0GfE5lPKHDPLlrZ8e3DBLVgAPlw== +"@budibase/types@2.0.19", "@budibase/types@^2.0.19": + version "2.0.19" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.19.tgz#a2b12d47ee1e843cf18d354cfa7ce0040c8c7103" + integrity sha512-vBpJ+GwMS9GPKJPxAa7nN2QYy8ThH3j1SAaj8bemJEheYvsFzXT0ueovphJ44Mx9kL8EAbk4T++xrUMIk/xtnQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 788dac0f8dc09264a4e70813398a48aa6a9395bf Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 5 Oct 2022 08:25:50 +0100 Subject: [PATCH 31/52] Use CJS style imports in plugin URL helper to work in jest, and respect plugin bucket env var --- packages/server/src/utilities/plugins.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/server/src/utilities/plugins.js b/packages/server/src/utilities/plugins.js index fae15fb184..96e496ed4e 100644 --- a/packages/server/src/utilities/plugins.js +++ b/packages/server/src/utilities/plugins.js @@ -1,5 +1,6 @@ -import env from "../environment" -import { plugins as ProPlugins } from "@budibase/pro" +const env = require("../environment") +const { plugins: ProPlugins } = require("@budibase/pro") +const { objectStore } = require("@budibase/backend-core") export const enrichPluginURLs = plugins => { if (!plugins || !plugins.length) { @@ -7,14 +8,14 @@ export const enrichPluginURLs = plugins => { } return plugins.map(plugin => { const cloud = !env.SELF_HOSTED - // In self host we need to prefix the path, as "plugins" is not part of the - // bucket path. In cloud, "plugins" is already part of the bucket path. - let jsUrl = cloud ? "https://cdn.budi.live/" : "/plugins/" + const bucket = objectStore.ObjectStoreBuckets.PLUGINS + const jsFileName = "plugin.min.js" + + // In self host we need to prefix the path, as the bucket name is not part + // of the bucket path. In cloud, it's already part of the bucket path. + let jsUrl = cloud ? "https://cdn.budi.live/" : `/${bucket}/` jsUrl += ProPlugins.getBucketPath(plugin.name) - jsUrl += "plugin.min.js" - return { - ...plugin, - jsUrl, - } + jsUrl += jsFileName + return { ...plugin, jsUrl } }) } From f2f842444a1d6786200190b170a4903e10cc1c8a Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 5 Oct 2022 08:57:26 +0100 Subject: [PATCH 32/52] Update plugin URL utility export to use CJS syntax --- packages/server/src/utilities/plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/utilities/plugins.js b/packages/server/src/utilities/plugins.js index 96e496ed4e..202a349b16 100644 --- a/packages/server/src/utilities/plugins.js +++ b/packages/server/src/utilities/plugins.js @@ -2,7 +2,7 @@ const env = require("../environment") const { plugins: ProPlugins } = require("@budibase/pro") const { objectStore } = require("@budibase/backend-core") -export const enrichPluginURLs = plugins => { +exports.enrichPluginURLs = plugins => { if (!plugins || !plugins.length) { return [] } From 2f220d668b418c56620f614de3037ace613d7527 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 5 Oct 2022 09:20:59 +0100 Subject: [PATCH 33/52] fix looping issues in automations --- packages/server/src/threads/automation.ts | 33 ++++++++++++++++++----- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts index f64552a92f..43aecd0e62 100644 --- a/packages/server/src/threads/automation.ts +++ b/packages/server/src/threads/automation.ts @@ -252,7 +252,7 @@ class Orchestrator { let loopStepNumber: any = undefined let loopSteps: LoopStep[] | undefined = [] let metadata - + let wasLoopStep = false // check if this is a recurring automation, if (isProdAppID(this._appId) && isRecurring(automation)) { metadata = await this.getMetadata() @@ -267,6 +267,7 @@ class Orchestrator { let input, iterations = 1, iterationCount = 0 + if (step.stepId === LOOP_STEP_ID) { loopStep = step loopStepNumber = stepCount @@ -277,10 +278,8 @@ class Orchestrator { input = await processObject(loopStep.inputs, this._context) iterations = getLoopIterations(loopStep as LoopStep, input) } - for (let index = 0; index < iterations; index++) { let originalStepInput = cloneDeep(step.inputs) - // Handle if the user has set a max iteration count or if it reaches the max limit set by us if (loopStep && input.binding) { let newInput = await processObject( @@ -313,13 +312,12 @@ class Orchestrator { } else { item = loopStep.inputs.binding } - this._context.steps[loopStepNumber] = { currentItem: item[index], } // The "Loop" binding in the front end is "fake", so replace it here so the context can understand it - // Pretty hacky because we need to account for the row object + // Pretty hacky because we need to account for the row objec for (let [key, value] of Object.entries(originalStepInput)) { if (typeof value === "object") { for (let [innerKey, innerValue] of Object.entries( @@ -331,6 +329,16 @@ class Orchestrator { innerValue, `steps.${loopStepNumber}` ) + } else if (typeof value === "object") { + for (let [innerObject, innerValue] of Object.entries( + originalStepInput[key][innerKey] + )) { + originalStepInput[key][innerKey][innerObject] = + automationUtils.substituteLoopStep( + innerValue, + `steps.${loopStepNumber}` + ) + } } } } else { @@ -386,6 +394,7 @@ class Orchestrator { let stepFn = await this.getStepFunctionality(step.stepId) let inputs = await processObject(originalStepInput, this._context) inputs = automationUtils.cleanInputValues(inputs, step.schema.inputs) + try { // appId is always passed const outputs = await stepFn({ @@ -394,6 +403,7 @@ class Orchestrator { emitter: this._emitter, context: this._context, }) + this._context.steps[stepCount] = outputs // if filter causes us to stop execution don't break the loop, set a var // so that we can finish iterating through the steps and record that it stopped @@ -419,6 +429,7 @@ class Orchestrator { console.error(`Automation error - ${step.stepId} - ${err}`) return err } + if (loopStep) { iterationCount++ if (index === iterations - 1) { @@ -429,6 +440,13 @@ class Orchestrator { } } + // Delete the step after the loop step as it's irrelevant, since information is included + // in the loop step + if (wasLoopStep) { + this._context.steps.splice(loopStepNumber + 1, 1) + wasLoopStep = false + } + console.log() if (loopSteps && loopSteps.length) { let tempOutput = { success: true, @@ -441,9 +459,12 @@ class Orchestrator { outputs: tempOutput, inputs: step.inputs, }) + this._context.steps[loopStepNumber] = tempOutput - this._context.steps.splice(loopStepNumber, 0, tempOutput) + console.log(loopStepNumber) + console.log(this._context) loopSteps = undefined + wasLoopStep = true } } From f4c9fc6897795096bd6fb61cd397b374212a98ee Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 5 Oct 2022 09:53:47 +0100 Subject: [PATCH 34/52] remove logs --- packages/server/src/threads/automation.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts index 43aecd0e62..6ef39dc1f5 100644 --- a/packages/server/src/threads/automation.ts +++ b/packages/server/src/threads/automation.ts @@ -317,7 +317,7 @@ class Orchestrator { } // The "Loop" binding in the front end is "fake", so replace it here so the context can understand it - // Pretty hacky because we need to account for the row objec + // Pretty hacky because we need to account for the row object for (let [key, value] of Object.entries(originalStepInput)) { if (typeof value === "object") { for (let [innerKey, innerValue] of Object.entries( @@ -461,8 +461,6 @@ class Orchestrator { }) this._context.steps[loopStepNumber] = tempOutput - console.log(loopStepNumber) - console.log(this._context) loopSteps = undefined wasLoopStep = true } From bd47c948c511f4e953d158af22ac32fdf7d77c79 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 5 Oct 2022 10:01:11 +0100 Subject: [PATCH 35/52] one more log --- packages/server/src/threads/automation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts index 6ef39dc1f5..64ae9439d8 100644 --- a/packages/server/src/threads/automation.ts +++ b/packages/server/src/threads/automation.ts @@ -446,7 +446,7 @@ class Orchestrator { this._context.steps.splice(loopStepNumber + 1, 1) wasLoopStep = false } - console.log() + if (loopSteps && loopSteps.length) { let tempOutput = { success: true, From c2a9e32be77af37bad6551157b8831e17b6fe194 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 5 Oct 2022 09:23:48 +0000 Subject: [PATCH 36/52] v2.0.20 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 1b81e62403..a4f5485f2a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.19", + "version": "2.0.20", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index fd98bd5f75..a650cd8291 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.19", + "version": "2.0.20", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.0.19", + "@budibase/types": "^2.0.20", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6e5924d30a..a16417e075 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.0.19", + "version": "2.0.20", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.0.19", + "@budibase/string-templates": "^2.0.20", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index e2ce507f15..0a69d4426c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.19", + "version": "2.0.20", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.0.19", - "@budibase/client": "^2.0.19", - "@budibase/frontend-core": "^2.0.19", - "@budibase/string-templates": "^2.0.19", + "@budibase/bbui": "^2.0.20", + "@budibase/client": "^2.0.20", + "@budibase/frontend-core": "^2.0.20", + "@budibase/string-templates": "^2.0.20", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 4d52b8f6f0..2f1d007dc3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.19", + "version": "2.0.20", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.0.19", - "@budibase/string-templates": "^2.0.19", - "@budibase/types": "^2.0.19", + "@budibase/backend-core": "^2.0.20", + "@budibase/string-templates": "^2.0.20", + "@budibase/types": "^2.0.20", "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 985fc34814..96fdd4b653 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.19", + "version": "2.0.20", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.0.19", - "@budibase/frontend-core": "^2.0.19", - "@budibase/string-templates": "^2.0.19", + "@budibase/bbui": "^2.0.20", + "@budibase/frontend-core": "^2.0.20", + "@budibase/string-templates": "^2.0.20", "@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 ff469ad662..36242ccd9d 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.19", + "version": "2.0.20", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.0.19", + "@budibase/bbui": "^2.0.20", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 2cb3b00a4d..b0b8441979 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.19", + "version": "2.0.20", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 38e1f273e2..364ef28b26 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.19", + "version": "2.0.20", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.0.19", - "@budibase/client": "^2.0.19", + "@budibase/backend-core": "^2.0.20", + "@budibase/client": "^2.0.20", "@budibase/pro": "2.0.19", - "@budibase/string-templates": "^2.0.19", - "@budibase/types": "^2.0.19", + "@budibase/string-templates": "^2.0.20", + "@budibase/types": "^2.0.20", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 5aaad0f597..22a24be936 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.19", + "version": "2.0.20", "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 9f89aa3947..909f5d7a23 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.19", + "version": "2.0.20", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 43a4165439..8790f36731 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.19", + "version": "2.0.20", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.0.19", + "@budibase/backend-core": "^2.0.20", "@budibase/pro": "2.0.19", - "@budibase/string-templates": "^2.0.19", - "@budibase/types": "^2.0.19", + "@budibase/string-templates": "^2.0.20", + "@budibase/types": "^2.0.20", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 749bfeeaaeb036b2254f7df3aef1be7e70dad489 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 5 Oct 2022 09:27:39 +0000 Subject: [PATCH 37/52] Update pro version to 2.0.20 --- 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 364ef28b26..c70d0e1240 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.0.20", "@budibase/client": "^2.0.20", - "@budibase/pro": "2.0.19", + "@budibase/pro": "2.0.20", "@budibase/string-templates": "^2.0.20", "@budibase/types": "^2.0.20", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index b7ae45ebd2..710128ae86 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.19": - version "2.0.19" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.19.tgz#21c2f53e8377034f289e2b1e5854b5b25df39c33" - integrity sha512-IPNRIpgbBu0Rn1HGYdqGZOZnW4qMCC6SWdB7cwGq79On3+O5xN6m+FUJ4lEh+YE02GT4CnTWFvARWgwpEuE0ig== +"@budibase/backend-core@2.0.20": + version "2.0.20" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.20.tgz#9eb7e663b0d2e99fe506e4cbfd71fcaac6412368" + integrity sha512-QHTns6/7JPHlc6xpMwmPxn3cJ0jwJ//+mHlfWw74JSbNz2GGhvbsQQopa56usWSJQroAxlTZ5yMOwgm7BfXVyg== dependencies: - "@budibase/types" "^2.0.19" + "@budibase/types" "^2.0.20" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.19": - version "2.0.19" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.19.tgz#2d7f00dec028c3cde0bafae10721c68ffa1e45bb" - integrity sha512-O7jDcjMgPmnZtn5Db+dnhjXF0m1NwWtrE9yanU3FjJpgE4lHzF8O1R08WyLUuCgUcJ6+DETLa9DZmDkj/9xh8g== +"@budibase/pro@2.0.20": + version "2.0.20" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.20.tgz#f3fefd4778b38db5e06935cdca294da52c65a385" + integrity sha512-orsWrmOIG6e+hTDhZ/k4n+fFy/1yLfz7c0w5/SkEhm/CbSEnKszr9P2+e1+P6eXWQI9OoHeBXknAk3+u24kD4w== dependencies: - "@budibase/backend-core" "2.0.19" - "@budibase/types" "2.0.19" + "@budibase/backend-core" "2.0.20" + "@budibase/types" "2.0.20" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.19", "@budibase/types@^2.0.19": - version "2.0.19" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.19.tgz#a2b12d47ee1e843cf18d354cfa7ce0040c8c7103" - integrity sha512-vBpJ+GwMS9GPKJPxAa7nN2QYy8ThH3j1SAaj8bemJEheYvsFzXT0ueovphJ44Mx9kL8EAbk4T++xrUMIk/xtnQ== +"@budibase/types@2.0.20", "@budibase/types@^2.0.20": + version "2.0.20" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.20.tgz#3982951c777839e64a400ba3a057b983125b7efe" + integrity sha512-KZ/XTaGtJC/M/4KhbkAJicSdBvQMeMo0MnpcsxDNU5yEmx0lubYjaWm8SFLJrPofYMX53LKPncaOS+1To44piw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 8790f36731..688093c236 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.0.20", - "@budibase/pro": "2.0.19", + "@budibase/pro": "2.0.20", "@budibase/string-templates": "^2.0.20", "@budibase/types": "^2.0.20", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index a4a08e4ee8..4017232c48 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.19": - version "2.0.19" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.19.tgz#21c2f53e8377034f289e2b1e5854b5b25df39c33" - integrity sha512-IPNRIpgbBu0Rn1HGYdqGZOZnW4qMCC6SWdB7cwGq79On3+O5xN6m+FUJ4lEh+YE02GT4CnTWFvARWgwpEuE0ig== +"@budibase/backend-core@2.0.20": + version "2.0.20" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.20.tgz#9eb7e663b0d2e99fe506e4cbfd71fcaac6412368" + integrity sha512-QHTns6/7JPHlc6xpMwmPxn3cJ0jwJ//+mHlfWw74JSbNz2GGhvbsQQopa56usWSJQroAxlTZ5yMOwgm7BfXVyg== dependencies: - "@budibase/types" "^2.0.19" + "@budibase/types" "^2.0.20" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.19": - version "2.0.19" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.19.tgz#2d7f00dec028c3cde0bafae10721c68ffa1e45bb" - integrity sha512-O7jDcjMgPmnZtn5Db+dnhjXF0m1NwWtrE9yanU3FjJpgE4lHzF8O1R08WyLUuCgUcJ6+DETLa9DZmDkj/9xh8g== +"@budibase/pro@2.0.20": + version "2.0.20" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.20.tgz#f3fefd4778b38db5e06935cdca294da52c65a385" + integrity sha512-orsWrmOIG6e+hTDhZ/k4n+fFy/1yLfz7c0w5/SkEhm/CbSEnKszr9P2+e1+P6eXWQI9OoHeBXknAk3+u24kD4w== dependencies: - "@budibase/backend-core" "2.0.19" - "@budibase/types" "2.0.19" + "@budibase/backend-core" "2.0.20" + "@budibase/types" "2.0.20" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.19", "@budibase/types@^2.0.19": - version "2.0.19" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.19.tgz#a2b12d47ee1e843cf18d354cfa7ce0040c8c7103" - integrity sha512-vBpJ+GwMS9GPKJPxAa7nN2QYy8ThH3j1SAaj8bemJEheYvsFzXT0ueovphJ44Mx9kL8EAbk4T++xrUMIk/xtnQ== +"@budibase/types@2.0.20", "@budibase/types@^2.0.20": + version "2.0.20" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.20.tgz#3982951c777839e64a400ba3a057b983125b7efe" + integrity sha512-KZ/XTaGtJC/M/4KhbkAJicSdBvQMeMo0MnpcsxDNU5yEmx0lubYjaWm8SFLJrPofYMX53LKPncaOS+1To44piw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From acf583120a5e5389242eb97d1c8d65d25a4f99d0 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 5 Oct 2022 12:40:53 +0100 Subject: [PATCH 38/52] Removed filter excluding links from user bindings. --- .../builder/src/builderStore/dataBinding.js | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index 7456ec5691..c83daa7807 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -396,19 +396,17 @@ export const getUserBindings = () => { bindings = keys.reduce((acc, key) => { const fieldSchema = schema[key] - if (fieldSchema.type !== "link") { - acc.push({ - type: "context", - runtimeBinding: `${safeUser}.${makePropSafe(key)}`, - readableBinding: `Current User.${key}`, - // Field schema and provider are required to construct relationship - // datasource options, based on bindable properties - fieldSchema, - providerId: "user", - category: "Current User", - icon: "User", - }) - } + acc.push({ + type: "context", + runtimeBinding: `${safeUser}.${makePropSafe(key)}`, + readableBinding: `Current User.${key}`, + // Field schema and provider are required to construct relationship + // datasource options, based on bindable properties + fieldSchema, + providerId: "user", + category: "Current User", + icon: "User", + }) return acc }, []) From d8452a92e178097fb38fe86747ca81a2c1e4a814 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 5 Oct 2022 12:17:39 +0000 Subject: [PATCH 39/52] v2.0.21 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index a4f5485f2a..787aa4c660 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.20", + "version": "2.0.21", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a650cd8291..d179ef217f 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.20", + "version": "2.0.21", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.0.20", + "@budibase/types": "^2.0.21", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index a16417e075..08afc2ff7b 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.0.20", + "version": "2.0.21", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.0.20", + "@budibase/string-templates": "^2.0.21", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 0a69d4426c..81860c9974 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.20", + "version": "2.0.21", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.0.20", - "@budibase/client": "^2.0.20", - "@budibase/frontend-core": "^2.0.20", - "@budibase/string-templates": "^2.0.20", + "@budibase/bbui": "^2.0.21", + "@budibase/client": "^2.0.21", + "@budibase/frontend-core": "^2.0.21", + "@budibase/string-templates": "^2.0.21", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 2f1d007dc3..d5ccdc2ffe 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.20", + "version": "2.0.21", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.0.20", - "@budibase/string-templates": "^2.0.20", - "@budibase/types": "^2.0.20", + "@budibase/backend-core": "^2.0.21", + "@budibase/string-templates": "^2.0.21", + "@budibase/types": "^2.0.21", "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 96fdd4b653..8825c6082c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.20", + "version": "2.0.21", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.0.20", - "@budibase/frontend-core": "^2.0.20", - "@budibase/string-templates": "^2.0.20", + "@budibase/bbui": "^2.0.21", + "@budibase/frontend-core": "^2.0.21", + "@budibase/string-templates": "^2.0.21", "@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 36242ccd9d..4d32da26ba 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.20", + "version": "2.0.21", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.0.20", + "@budibase/bbui": "^2.0.21", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b0b8441979..bd31f11df9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.20", + "version": "2.0.21", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index c70d0e1240..62776b3b13 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.20", + "version": "2.0.21", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.0.20", - "@budibase/client": "^2.0.20", + "@budibase/backend-core": "^2.0.21", + "@budibase/client": "^2.0.21", "@budibase/pro": "2.0.20", - "@budibase/string-templates": "^2.0.20", - "@budibase/types": "^2.0.20", + "@budibase/string-templates": "^2.0.21", + "@budibase/types": "^2.0.21", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 22a24be936..851ee9d40c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.20", + "version": "2.0.21", "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 909f5d7a23..13bc5c4e79 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.20", + "version": "2.0.21", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 688093c236..d20c30dea7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.20", + "version": "2.0.21", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.0.20", + "@budibase/backend-core": "^2.0.21", "@budibase/pro": "2.0.20", - "@budibase/string-templates": "^2.0.20", - "@budibase/types": "^2.0.20", + "@budibase/string-templates": "^2.0.21", + "@budibase/types": "^2.0.21", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 95dd5eefbb9af67d98b142224e4f93a6e0c3bd87 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 5 Oct 2022 12:21:31 +0000 Subject: [PATCH 40/52] Update pro version to 2.0.21 --- 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 62776b3b13..5bbcb7e94e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.0.21", "@budibase/client": "^2.0.21", - "@budibase/pro": "2.0.20", + "@budibase/pro": "2.0.21", "@budibase/string-templates": "^2.0.21", "@budibase/types": "^2.0.21", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 710128ae86..5fe5704d9a 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.20": - version "2.0.20" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.20.tgz#9eb7e663b0d2e99fe506e4cbfd71fcaac6412368" - integrity sha512-QHTns6/7JPHlc6xpMwmPxn3cJ0jwJ//+mHlfWw74JSbNz2GGhvbsQQopa56usWSJQroAxlTZ5yMOwgm7BfXVyg== +"@budibase/backend-core@2.0.21": + version "2.0.21" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.21.tgz#52c556f578cfbb928a1fd2f61459952fb1ae0d8a" + integrity sha512-RRgOuX4P73mvdc+lxKdU0wv5YX4f4cbAAEytGxM0cTO3h3EwXFiiLtgw7Z9vz4LB/4wKVq5bp3PT7Zq8EEGjIg== dependencies: - "@budibase/types" "^2.0.20" + "@budibase/types" "^2.0.21" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.20": - version "2.0.20" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.20.tgz#f3fefd4778b38db5e06935cdca294da52c65a385" - integrity sha512-orsWrmOIG6e+hTDhZ/k4n+fFy/1yLfz7c0w5/SkEhm/CbSEnKszr9P2+e1+P6eXWQI9OoHeBXknAk3+u24kD4w== +"@budibase/pro@2.0.21": + version "2.0.21" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.21.tgz#2531b653f136deffbc5b38c734115611b669d1c2" + integrity sha512-0fnDUbcGJ7UReusnxXdKl+dTwdflY/j8mMmAtuCXV9HNKwEwYYv8HQdQFRvORY/sE/SXz2emd1A7FXdlgbtXug== dependencies: - "@budibase/backend-core" "2.0.20" - "@budibase/types" "2.0.20" + "@budibase/backend-core" "2.0.21" + "@budibase/types" "2.0.21" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.20", "@budibase/types@^2.0.20": - version "2.0.20" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.20.tgz#3982951c777839e64a400ba3a057b983125b7efe" - integrity sha512-KZ/XTaGtJC/M/4KhbkAJicSdBvQMeMo0MnpcsxDNU5yEmx0lubYjaWm8SFLJrPofYMX53LKPncaOS+1To44piw== +"@budibase/types@2.0.21", "@budibase/types@^2.0.21": + version "2.0.21" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.21.tgz#507ace84a6a4e9b86c093c6b829528ca9e30c98f" + integrity sha512-tv3oftM9s3UE0NJgl3suxCbt3XPVsWwUPpSHLKkvfTSR4lNL7D41w7izgMhRH+RpuQ2uGID4Tc87fk4F9UW8oQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index d20c30dea7..81c1ddb157 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.0.21", - "@budibase/pro": "2.0.20", + "@budibase/pro": "2.0.21", "@budibase/string-templates": "^2.0.21", "@budibase/types": "^2.0.21", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 4017232c48..b5d4b29c5a 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.20": - version "2.0.20" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.20.tgz#9eb7e663b0d2e99fe506e4cbfd71fcaac6412368" - integrity sha512-QHTns6/7JPHlc6xpMwmPxn3cJ0jwJ//+mHlfWw74JSbNz2GGhvbsQQopa56usWSJQroAxlTZ5yMOwgm7BfXVyg== +"@budibase/backend-core@2.0.21": + version "2.0.21" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.21.tgz#52c556f578cfbb928a1fd2f61459952fb1ae0d8a" + integrity sha512-RRgOuX4P73mvdc+lxKdU0wv5YX4f4cbAAEytGxM0cTO3h3EwXFiiLtgw7Z9vz4LB/4wKVq5bp3PT7Zq8EEGjIg== dependencies: - "@budibase/types" "^2.0.20" + "@budibase/types" "^2.0.21" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.20": - version "2.0.20" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.20.tgz#f3fefd4778b38db5e06935cdca294da52c65a385" - integrity sha512-orsWrmOIG6e+hTDhZ/k4n+fFy/1yLfz7c0w5/SkEhm/CbSEnKszr9P2+e1+P6eXWQI9OoHeBXknAk3+u24kD4w== +"@budibase/pro@2.0.21": + version "2.0.21" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.21.tgz#2531b653f136deffbc5b38c734115611b669d1c2" + integrity sha512-0fnDUbcGJ7UReusnxXdKl+dTwdflY/j8mMmAtuCXV9HNKwEwYYv8HQdQFRvORY/sE/SXz2emd1A7FXdlgbtXug== dependencies: - "@budibase/backend-core" "2.0.20" - "@budibase/types" "2.0.20" + "@budibase/backend-core" "2.0.21" + "@budibase/types" "2.0.21" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.20", "@budibase/types@^2.0.20": - version "2.0.20" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.20.tgz#3982951c777839e64a400ba3a057b983125b7efe" - integrity sha512-KZ/XTaGtJC/M/4KhbkAJicSdBvQMeMo0MnpcsxDNU5yEmx0lubYjaWm8SFLJrPofYMX53LKPncaOS+1To44piw== +"@budibase/types@2.0.21", "@budibase/types@^2.0.21": + version "2.0.21" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.21.tgz#507ace84a6a4e9b86c093c6b829528ca9e30c98f" + integrity sha512-tv3oftM9s3UE0NJgl3suxCbt3XPVsWwUPpSHLKkvfTSR4lNL7D41w7izgMhRH+RpuQ2uGID4Tc87fk4F9UW8oQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 969c67f767357074d80808e78dbf2671971e67a0 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 5 Oct 2022 15:53:06 +0100 Subject: [PATCH 41/52] Use OG class properties for iOS13 support --- .../app/charts/ApexOptionsBuilder.js | 58 ++++++------- packages/frontend-core/src/fetch/DataFetch.js | 82 +++++++++---------- 2 files changed, 71 insertions(+), 69 deletions(-) diff --git a/packages/client/src/components/app/charts/ApexOptionsBuilder.js b/packages/client/src/components/app/charts/ApexOptionsBuilder.js index 31c5a820f7..6b3e3a4440 100644 --- a/packages/client/src/components/app/charts/ApexOptionsBuilder.js +++ b/packages/client/src/components/app/charts/ApexOptionsBuilder.js @@ -1,37 +1,39 @@ export class ApexOptionsBuilder { - formatters = { - ["Default"]: val => (isNaN(val) ? val : Math.round(val * 100) / 100), - ["Thousands"]: val => `${Math.round(val / 1000)}K`, - ["Millions"]: val => `${Math.round(val / 1000000)}M`, - } - options = { - series: [], - legend: { - show: false, - position: "top", - horizontalAlign: "right", - showForSingleSeries: true, - showForNullSeries: true, - showForZeroSeries: true, - }, - chart: { - toolbar: { + constructor() { + this.formatters = { + ["Default"]: val => (isNaN(val) ? val : Math.round(val * 100) / 100), + ["Thousands"]: val => `${Math.round(val / 1000)}K`, + ["Millions"]: val => `${Math.round(val / 1000000)}M`, + } + this.options = { + series: [], + legend: { show: false, + position: "top", + horizontalAlign: "right", + showForSingleSeries: true, + showForNullSeries: true, + showForZeroSeries: true, }, - zoom: { - enabled: false, + chart: { + toolbar: { + show: false, + }, + zoom: { + enabled: false, + }, }, - }, - xaxis: { - labels: { - formatter: this.formatters.Default, + xaxis: { + labels: { + formatter: this.formatters.Default, + }, }, - }, - yaxis: { - labels: { - formatter: this.formatters.Default, + yaxis: { + labels: { + formatter: this.formatters.Default, + }, }, - }, + } } setOption(path, value) { diff --git a/packages/frontend-core/src/fetch/DataFetch.js b/packages/frontend-core/src/fetch/DataFetch.js index a3cc1c231c..31007121f1 100644 --- a/packages/frontend-core/src/fetch/DataFetch.js +++ b/packages/frontend-core/src/fetch/DataFetch.js @@ -14,52 +14,52 @@ import { convertJSONSchemaToTableSchema } from "../utils/json" * For other types of datasource, this class is overridden and extended. */ export default class DataFetch { - // API client - API = null - - // Feature flags - featureStore = writable({ - supportsSearch: false, - supportsSort: false, - supportsPagination: false, - }) - - // Config - options = { - datasource: null, - limit: 10, - - // Search config - filter: null, - query: null, - - // Sorting config - sortColumn: null, - sortOrder: "ascending", - sortType: null, - - // Pagination config - paginate: true, - } - - // State of the fetch - store = writable({ - rows: [], - info: null, - schema: null, - loading: false, - loaded: false, - query: null, - pageNumber: 0, - cursor: null, - cursors: [], - }) - /** * Constructs a new DataFetch instance. * @param opts the fetch options */ constructor(opts) { + // API client + this.API = null + + // Feature flags + this.featureStore = writable({ + supportsSearch: false, + supportsSort: false, + supportsPagination: false, + }) + + // Config + this.options = { + datasource: null, + limit: 10, + + // Search config + filter: null, + query: null, + + // Sorting config + sortColumn: null, + sortOrder: "ascending", + sortType: null, + + // Pagination config + paginate: true, + } + + // State of the fetch + this.store = writable({ + rows: [], + info: null, + schema: null, + loading: false, + loaded: false, + query: null, + pageNumber: 0, + cursor: null, + cursors: [], + }) + // Merge options with their default values this.API = opts?.API this.options = { From dff64a1b62990467f0af67bc8eb02369a27ada08 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 5 Oct 2022 15:44:22 +0000 Subject: [PATCH 42/52] v2.0.22 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 787aa4c660..3e4c32deb3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.21", + "version": "2.0.22", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d179ef217f..7f8f6d04f7 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.21", + "version": "2.0.22", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.0.21", + "@budibase/types": "^2.0.22", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 08afc2ff7b..7c2f1d017a 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.0.21", + "version": "2.0.22", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.0.21", + "@budibase/string-templates": "^2.0.22", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 81860c9974..84242e4e46 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.21", + "version": "2.0.22", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.0.21", - "@budibase/client": "^2.0.21", - "@budibase/frontend-core": "^2.0.21", - "@budibase/string-templates": "^2.0.21", + "@budibase/bbui": "^2.0.22", + "@budibase/client": "^2.0.22", + "@budibase/frontend-core": "^2.0.22", + "@budibase/string-templates": "^2.0.22", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index d5ccdc2ffe..90258d0bc8 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.21", + "version": "2.0.22", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.0.21", - "@budibase/string-templates": "^2.0.21", - "@budibase/types": "^2.0.21", + "@budibase/backend-core": "^2.0.22", + "@budibase/string-templates": "^2.0.22", + "@budibase/types": "^2.0.22", "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 8825c6082c..d877c4599f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.21", + "version": "2.0.22", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.0.21", - "@budibase/frontend-core": "^2.0.21", - "@budibase/string-templates": "^2.0.21", + "@budibase/bbui": "^2.0.22", + "@budibase/frontend-core": "^2.0.22", + "@budibase/string-templates": "^2.0.22", "@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 4d32da26ba..20b6659f24 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.21", + "version": "2.0.22", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.0.21", + "@budibase/bbui": "^2.0.22", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index bd31f11df9..7dc9447c26 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.21", + "version": "2.0.22", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 5bbcb7e94e..bbcd062e2e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.21", + "version": "2.0.22", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.0.21", - "@budibase/client": "^2.0.21", + "@budibase/backend-core": "^2.0.22", + "@budibase/client": "^2.0.22", "@budibase/pro": "2.0.21", - "@budibase/string-templates": "^2.0.21", - "@budibase/types": "^2.0.21", + "@budibase/string-templates": "^2.0.22", + "@budibase/types": "^2.0.22", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 851ee9d40c..f88f14c27b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.21", + "version": "2.0.22", "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 13bc5c4e79..85960d872a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.21", + "version": "2.0.22", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 81c1ddb157..b2b313d694 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.21", + "version": "2.0.22", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.0.21", + "@budibase/backend-core": "^2.0.22", "@budibase/pro": "2.0.21", - "@budibase/string-templates": "^2.0.21", - "@budibase/types": "^2.0.21", + "@budibase/string-templates": "^2.0.22", + "@budibase/types": "^2.0.22", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 21f74b4ae7fbee1641d8ade39a99d5120aac8e9b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 5 Oct 2022 15:48:15 +0000 Subject: [PATCH 43/52] Update pro version to 2.0.22 --- 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 bbcd062e2e..f9945c8b31 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.0.22", "@budibase/client": "^2.0.22", - "@budibase/pro": "2.0.21", + "@budibase/pro": "2.0.22", "@budibase/string-templates": "^2.0.22", "@budibase/types": "^2.0.22", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 5fe5704d9a..123c09a2a0 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.21": - version "2.0.21" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.21.tgz#52c556f578cfbb928a1fd2f61459952fb1ae0d8a" - integrity sha512-RRgOuX4P73mvdc+lxKdU0wv5YX4f4cbAAEytGxM0cTO3h3EwXFiiLtgw7Z9vz4LB/4wKVq5bp3PT7Zq8EEGjIg== +"@budibase/backend-core@2.0.22": + version "2.0.22" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.22.tgz#857c6928c08e1a0307afac4e605e360f3ce91c97" + integrity sha512-X6n/UdOR+AnBVfmLy7YUT1uDGy8VPEz5em0jjVRPflxnJcZ5x59YXLBTROkK6PqWsgqheCkrP1Jev7rxCVCTow== dependencies: - "@budibase/types" "^2.0.21" + "@budibase/types" "^2.0.22" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.21": - version "2.0.21" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.21.tgz#2531b653f136deffbc5b38c734115611b669d1c2" - integrity sha512-0fnDUbcGJ7UReusnxXdKl+dTwdflY/j8mMmAtuCXV9HNKwEwYYv8HQdQFRvORY/sE/SXz2emd1A7FXdlgbtXug== +"@budibase/pro@2.0.22": + version "2.0.22" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.22.tgz#950c541a4eb858ca41e31e691bcbd388cc2523d6" + integrity sha512-4GepvO+fjuAyKH/e6m751x/UMCOPBIx+OXZ63AS8NfHvXYhxPxODsYC+rK0zuDvYEmtVNJnTYSLLmiYKXfSShw== dependencies: - "@budibase/backend-core" "2.0.21" - "@budibase/types" "2.0.21" + "@budibase/backend-core" "2.0.22" + "@budibase/types" "2.0.22" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.21", "@budibase/types@^2.0.21": - version "2.0.21" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.21.tgz#507ace84a6a4e9b86c093c6b829528ca9e30c98f" - integrity sha512-tv3oftM9s3UE0NJgl3suxCbt3XPVsWwUPpSHLKkvfTSR4lNL7D41w7izgMhRH+RpuQ2uGID4Tc87fk4F9UW8oQ== +"@budibase/types@2.0.22", "@budibase/types@^2.0.22": + version "2.0.22" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.22.tgz#c17d518294f1d53ad3251e659b5bd689f50914b0" + integrity sha512-qtNFWYbbdGQzmelkBO/22Xc1nug7m8C5D+ugwItV6J+qYJqcFAUPxjfTILYfICDDGiF3g9waA6+Y/JnFn9ujZg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index b2b313d694..b47461b2fd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.0.22", - "@budibase/pro": "2.0.21", + "@budibase/pro": "2.0.22", "@budibase/string-templates": "^2.0.22", "@budibase/types": "^2.0.22", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index b5d4b29c5a..32fee7909b 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.21": - version "2.0.21" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.21.tgz#52c556f578cfbb928a1fd2f61459952fb1ae0d8a" - integrity sha512-RRgOuX4P73mvdc+lxKdU0wv5YX4f4cbAAEytGxM0cTO3h3EwXFiiLtgw7Z9vz4LB/4wKVq5bp3PT7Zq8EEGjIg== +"@budibase/backend-core@2.0.22": + version "2.0.22" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.22.tgz#857c6928c08e1a0307afac4e605e360f3ce91c97" + integrity sha512-X6n/UdOR+AnBVfmLy7YUT1uDGy8VPEz5em0jjVRPflxnJcZ5x59YXLBTROkK6PqWsgqheCkrP1Jev7rxCVCTow== dependencies: - "@budibase/types" "^2.0.21" + "@budibase/types" "^2.0.22" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.21": - version "2.0.21" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.21.tgz#2531b653f136deffbc5b38c734115611b669d1c2" - integrity sha512-0fnDUbcGJ7UReusnxXdKl+dTwdflY/j8mMmAtuCXV9HNKwEwYYv8HQdQFRvORY/sE/SXz2emd1A7FXdlgbtXug== +"@budibase/pro@2.0.22": + version "2.0.22" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.22.tgz#950c541a4eb858ca41e31e691bcbd388cc2523d6" + integrity sha512-4GepvO+fjuAyKH/e6m751x/UMCOPBIx+OXZ63AS8NfHvXYhxPxODsYC+rK0zuDvYEmtVNJnTYSLLmiYKXfSShw== dependencies: - "@budibase/backend-core" "2.0.21" - "@budibase/types" "2.0.21" + "@budibase/backend-core" "2.0.22" + "@budibase/types" "2.0.22" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.21", "@budibase/types@^2.0.21": - version "2.0.21" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.21.tgz#507ace84a6a4e9b86c093c6b829528ca9e30c98f" - integrity sha512-tv3oftM9s3UE0NJgl3suxCbt3XPVsWwUPpSHLKkvfTSR4lNL7D41w7izgMhRH+RpuQ2uGID4Tc87fk4F9UW8oQ== +"@budibase/types@2.0.22", "@budibase/types@^2.0.22": + version "2.0.22" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.22.tgz#c17d518294f1d53ad3251e659b5bd689f50914b0" + integrity sha512-qtNFWYbbdGQzmelkBO/22Xc1nug7m8C5D+ugwItV6J+qYJqcFAUPxjfTILYfICDDGiF3g9waA6+Y/JnFn9ujZg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 2562b8e8eeb47645740e07090d8f8ec0cef295b8 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Thu, 6 Oct 2022 11:10:49 +0100 Subject: [PATCH 44/52] Add instructions for Dev Env in Windows. --- docs/DEV-SETUP-WINDOWS.md | 80 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 docs/DEV-SETUP-WINDOWS.md diff --git a/docs/DEV-SETUP-WINDOWS.md b/docs/DEV-SETUP-WINDOWS.md new file mode 100644 index 0000000000..9f16f86f7d --- /dev/null +++ b/docs/DEV-SETUP-WINDOWS.md @@ -0,0 +1,80 @@ +## Dev Environment on Windows 10/11 (WSL2) + + +### Install WSL with Ubuntu LTS + +Enable WSL 2 on Windows 10/11 for docker support. +``` +wsl --set-default-version 2 +``` +Install Ubuntu LTS. +``` +wsl --install Ubuntu +``` + +Or follow the instruction here: +https://learn.microsoft.com/en-us/windows/wsl/install + +### Install Docker in windows +Download the installer from docker and install it. + +Check this url for more detailed instructions: +https://docs.docker.com/desktop/install/windows-install/ + +You should follow the next steps from within the Ubuntu terminal. + +### Install NVM & Node 16 +NVM documentation: https://github.com/nvm-sh/nvm#installing-and-updating +Install NVM +``` +curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash +``` +Install Node 16 +``` +nvm install 16 +``` + + +### Install npm requirements + +``` +npm install -g yarn jest lerna +``` + +### Clone the repo +``` +git clone https://github.com/Budibase/budibase.git +``` + +### Check Versions + +This setup process was tested on Windows 11 with version numbers show below. Your mileage may vary using anything else. + +- Docker: 20.10.7 +- Docker-Compose: 2.10.2 +- Node: v16.17.1 +- Yarn: 1.22.19 +- Lerna: 5.5.4 + +### Build + +``` +cd budibase +yarn setup +``` +The yarn setup command runs several build steps i.e. +``` +node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev +``` +So this command will actually run the application in dev mode. It creates .env files under `./packages/server` and `./packages/worker` and runs docker containers for each service via docker-compose. + +The dev version will be available on port 10000 i.e. + +http://127.0.0.1:10000/builder/admin + +### Working with the code +Here are the instructions to work on the application from within Visual Studio Code (in Windows) through the WSL. All the commands and files are within the Ubuntu system and it should run as if you were working on a Linux machine. + +https://code.visualstudio.com/docs/remote/wsl + +Note you will be able to run the application from within the WSL terminal and you will be able to access the application from the a browser in Windows. \ No newline at end of file From 4bd7a78fb6f4eb58d3d6d85ccb41ef32fd249459 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Thu, 6 Oct 2022 11:30:33 +0100 Subject: [PATCH 45/52] Fix formating --- docs/DEV-SETUP-WINDOWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/DEV-SETUP-WINDOWS.md b/docs/DEV-SETUP-WINDOWS.md index 9f16f86f7d..1f7d23ac5e 100644 --- a/docs/DEV-SETUP-WINDOWS.md +++ b/docs/DEV-SETUP-WINDOWS.md @@ -25,6 +25,7 @@ You should follow the next steps from within the Ubuntu terminal. ### Install NVM & Node 16 NVM documentation: https://github.com/nvm-sh/nvm#installing-and-updating + Install NVM ``` curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash From a86cdb329100ff9d71018a3aba1f1edf53521a2e Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 6 Oct 2022 14:05:01 +0100 Subject: [PATCH 46/52] Fixing issue #8079 - making sure TARGETARCH gets correctly exported to environment to pick correct minio bundle. --- hosting/single/Dockerfile | 4 ++-- scripts/install-minio.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index f34290f627..58796f0362 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -19,8 +19,8 @@ ADD packages/worker . RUN node /pinVersions.js && yarn && yarn build && /cleanup.sh FROM couchdb:3.2.1 -# TARGETARCH can be amd64 or arm e.g. docker build --build-arg TARGETARCH=amd64 -ARG TARGETARCH=amd64 +ARG TARGETARCH +ENV TARGETARCH $TARGETARCH #TARGETBUILD can be set to single (for single docker image) or aas (for azure app service) # e.g. docker build --build-arg TARGETBUILD=aas .... ARG TARGETBUILD=single diff --git a/scripts/install-minio.sh b/scripts/install-minio.sh index 4f7e589e86..8297593599 100755 --- a/scripts/install-minio.sh +++ b/scripts/install-minio.sh @@ -1,8 +1,10 @@ #!/bin/bash if [[ $TARGETARCH == arm* ]] ; then + echo "INSTALLING ARM64 MINIO" wget https://dl.min.io/server/minio/release/linux-arm64/minio else + echo "INSTALLING AMD64 MINIO" wget https://dl.min.io/server/minio/release/linux-amd64/minio fi chmod +x minio From c5e13e48d500880cbfcae83576890eef035c9dd6 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Thu, 6 Oct 2022 14:39:51 +0100 Subject: [PATCH 47/52] Update node version --- docs/DEV-SETUP-DEBIAN.md | 15 +++++++++------ docs/DEV-SETUP-MACOSX.md | 9 ++++++--- docs/DEV-SETUP-WINDOWS.md | 8 ++++---- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/docs/DEV-SETUP-DEBIAN.md b/docs/DEV-SETUP-DEBIAN.md index 88a124708c..9edd8286cb 100644 --- a/docs/DEV-SETUP-DEBIAN.md +++ b/docs/DEV-SETUP-DEBIAN.md @@ -1,12 +1,15 @@ ## Dev Environment on Debian 11 -### Install Node +### Install NVM & Node 14 +NVM documentation: https://github.com/nvm-sh/nvm#installing-and-updating -Budibase requires a recent version of node (14+): +Install NVM ``` -curl -sL https://deb.nodesource.com/setup_16.x | sudo bash - -apt -y install nodejs -node -v +curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash +``` +Install Node 14 +``` +nvm install 14 ``` ### Install npm requirements @@ -31,7 +34,7 @@ This setup process was tested on Debian 11 (bullseye) with version numbers show - Docker: 20.10.5 - Docker-Compose: 1.29.2 -- Node: v16.15.1 +- Node: v14.20.1 - Yarn: 1.22.19 - Lerna: 5.1.4 diff --git a/docs/DEV-SETUP-MACOSX.md b/docs/DEV-SETUP-MACOSX.md index c5990e58da..d9e2dcad6a 100644 --- a/docs/DEV-SETUP-MACOSX.md +++ b/docs/DEV-SETUP-MACOSX.md @@ -11,7 +11,7 @@ through brew. ### Install Node -Budibase requires a recent version of node (14+): +Budibase requires a recent version of node 14: ``` brew install node npm node -v @@ -38,7 +38,7 @@ This setup process was tested on Mac OSX 12 (Monterey) with version numbers show - Docker: 20.10.14 - Docker-Compose: 2.6.0 -- Node: 18.3.0 +- Node: 14.20.1 - Yarn: 1.22.19 - Lerna: 5.1.4 @@ -59,4 +59,7 @@ The dev version will be available on port 10000 i.e. http://127.0.0.1:10000/builder/admin | **NOTE**: If you are working on a M1 Apple Silicon, you will need to uncomment `# platform: linux/amd64` line in -[hosting/docker-compose-dev.yaml](../hosting/docker-compose.dev.yaml) \ No newline at end of file +[hosting/docker-compose-dev.yaml](../hosting/docker-compose.dev.yaml) + +### Troubleshooting +If there are errors with the `yarn setup` command, you can try installing nvm and node 14. This is the same as the instructions for Debian 11. diff --git a/docs/DEV-SETUP-WINDOWS.md b/docs/DEV-SETUP-WINDOWS.md index 1f7d23ac5e..c5608b7567 100644 --- a/docs/DEV-SETUP-WINDOWS.md +++ b/docs/DEV-SETUP-WINDOWS.md @@ -23,16 +23,16 @@ https://docs.docker.com/desktop/install/windows-install/ You should follow the next steps from within the Ubuntu terminal. -### Install NVM & Node 16 +### Install NVM & Node 14 NVM documentation: https://github.com/nvm-sh/nvm#installing-and-updating Install NVM ``` curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash ``` -Install Node 16 +Install Node 14 ``` -nvm install 16 +nvm install 14 ``` @@ -53,7 +53,7 @@ This setup process was tested on Windows 11 with version numbers show below. You - Docker: 20.10.7 - Docker-Compose: 2.10.2 -- Node: v16.17.1 +- Node: v14.20.1 - Yarn: 1.22.19 - Lerna: 5.5.4 From b961887b6c8850d270f4a60ef04413133199271b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 6 Oct 2022 14:26:45 +0000 Subject: [PATCH 48/52] v2.0.23 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 3e4c32deb3..bc62b3c368 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.22", + "version": "2.0.23", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 7f8f6d04f7..a9c1e3eb59 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.22", + "version": "2.0.23", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.0.22", + "@budibase/types": "^2.0.23", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 7c2f1d017a..3ca5585e34 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.0.22", + "version": "2.0.23", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.0.22", + "@budibase/string-templates": "^2.0.23", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 84242e4e46..6f289d3433 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.22", + "version": "2.0.23", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.0.22", - "@budibase/client": "^2.0.22", - "@budibase/frontend-core": "^2.0.22", - "@budibase/string-templates": "^2.0.22", + "@budibase/bbui": "^2.0.23", + "@budibase/client": "^2.0.23", + "@budibase/frontend-core": "^2.0.23", + "@budibase/string-templates": "^2.0.23", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 90258d0bc8..e054839f25 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.22", + "version": "2.0.23", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.0.22", - "@budibase/string-templates": "^2.0.22", - "@budibase/types": "^2.0.22", + "@budibase/backend-core": "^2.0.23", + "@budibase/string-templates": "^2.0.23", + "@budibase/types": "^2.0.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 d877c4599f..f22039ae4f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.22", + "version": "2.0.23", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.0.22", - "@budibase/frontend-core": "^2.0.22", - "@budibase/string-templates": "^2.0.22", + "@budibase/bbui": "^2.0.23", + "@budibase/frontend-core": "^2.0.23", + "@budibase/string-templates": "^2.0.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 20b6659f24..3942ad481b 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.22", + "version": "2.0.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.0.22", + "@budibase/bbui": "^2.0.23", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7dc9447c26..59bd24e4ca 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.22", + "version": "2.0.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 f9945c8b31..7580e26e15 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.22", + "version": "2.0.23", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.0.22", - "@budibase/client": "^2.0.22", + "@budibase/backend-core": "^2.0.23", + "@budibase/client": "^2.0.23", "@budibase/pro": "2.0.22", - "@budibase/string-templates": "^2.0.22", - "@budibase/types": "^2.0.22", + "@budibase/string-templates": "^2.0.23", + "@budibase/types": "^2.0.23", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index f88f14c27b..651034e3fd 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.22", + "version": "2.0.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 85960d872a..8c1b53a33b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.22", + "version": "2.0.23", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index b47461b2fd..6102e677c1 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.22", + "version": "2.0.23", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.0.22", + "@budibase/backend-core": "^2.0.23", "@budibase/pro": "2.0.22", - "@budibase/string-templates": "^2.0.22", - "@budibase/types": "^2.0.22", + "@budibase/string-templates": "^2.0.23", + "@budibase/types": "^2.0.23", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From c19a67b095bd80f787a927edc40e3a664bec3d30 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 6 Oct 2022 14:30:28 +0000 Subject: [PATCH 49/52] Update pro version to 2.0.23 --- 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 7580e26e15..e9eca4136d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.0.23", "@budibase/client": "^2.0.23", - "@budibase/pro": "2.0.22", + "@budibase/pro": "2.0.23", "@budibase/string-templates": "^2.0.23", "@budibase/types": "^2.0.23", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 123c09a2a0..d70aabbcf7 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.22": - version "2.0.22" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.22.tgz#857c6928c08e1a0307afac4e605e360f3ce91c97" - integrity sha512-X6n/UdOR+AnBVfmLy7YUT1uDGy8VPEz5em0jjVRPflxnJcZ5x59YXLBTROkK6PqWsgqheCkrP1Jev7rxCVCTow== +"@budibase/backend-core@2.0.23": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.23.tgz#915d4ea2e78547795894b2aebd81b8a8c9b568db" + integrity sha512-wovJF+kS/vVs+cR6lHieEEs99vmXsOt5qKjMAkkMUVXmWBWPYQaLppz+dxTV9xXd8Ht9yFhnkbOo7QJxFE8+fA== dependencies: - "@budibase/types" "^2.0.22" + "@budibase/types" "^2.0.23" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.22": - version "2.0.22" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.22.tgz#950c541a4eb858ca41e31e691bcbd388cc2523d6" - integrity sha512-4GepvO+fjuAyKH/e6m751x/UMCOPBIx+OXZ63AS8NfHvXYhxPxODsYC+rK0zuDvYEmtVNJnTYSLLmiYKXfSShw== +"@budibase/pro@2.0.23": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.23.tgz#215759f07470d37b6571f54ad80d7fb38a2f902e" + integrity sha512-RP7lS076VP3W+9AI9d/ylM6k1YBotGlqkBrshgzX/pl1e2O9eg0MmG2/dP6X+w4LzGv2ruC7lfwyf3MgWgYFyQ== dependencies: - "@budibase/backend-core" "2.0.22" - "@budibase/types" "2.0.22" + "@budibase/backend-core" "2.0.23" + "@budibase/types" "2.0.23" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.22", "@budibase/types@^2.0.22": - version "2.0.22" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.22.tgz#c17d518294f1d53ad3251e659b5bd689f50914b0" - integrity sha512-qtNFWYbbdGQzmelkBO/22Xc1nug7m8C5D+ugwItV6J+qYJqcFAUPxjfTILYfICDDGiF3g9waA6+Y/JnFn9ujZg== +"@budibase/types@2.0.23", "@budibase/types@^2.0.23": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.23.tgz#2467342b9c48c965319182ef4cbb7166c8bf1e43" + integrity sha512-Oyq9tVwV+zl38III1or4Cr8VOKemMv3L/o95CBXdyZRDmmVfdzQgJ7AByUMOj9quEe6IjctdkOI4ssE8Fds9Dw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 6102e677c1..9763d42abf 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.0.23", - "@budibase/pro": "2.0.22", + "@budibase/pro": "2.0.23", "@budibase/string-templates": "^2.0.23", "@budibase/types": "^2.0.23", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 32fee7909b..f885ab690e 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.22": - version "2.0.22" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.22.tgz#857c6928c08e1a0307afac4e605e360f3ce91c97" - integrity sha512-X6n/UdOR+AnBVfmLy7YUT1uDGy8VPEz5em0jjVRPflxnJcZ5x59YXLBTROkK6PqWsgqheCkrP1Jev7rxCVCTow== +"@budibase/backend-core@2.0.23": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.23.tgz#915d4ea2e78547795894b2aebd81b8a8c9b568db" + integrity sha512-wovJF+kS/vVs+cR6lHieEEs99vmXsOt5qKjMAkkMUVXmWBWPYQaLppz+dxTV9xXd8Ht9yFhnkbOo7QJxFE8+fA== dependencies: - "@budibase/types" "^2.0.22" + "@budibase/types" "^2.0.23" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.22": - version "2.0.22" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.22.tgz#950c541a4eb858ca41e31e691bcbd388cc2523d6" - integrity sha512-4GepvO+fjuAyKH/e6m751x/UMCOPBIx+OXZ63AS8NfHvXYhxPxODsYC+rK0zuDvYEmtVNJnTYSLLmiYKXfSShw== +"@budibase/pro@2.0.23": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.23.tgz#215759f07470d37b6571f54ad80d7fb38a2f902e" + integrity sha512-RP7lS076VP3W+9AI9d/ylM6k1YBotGlqkBrshgzX/pl1e2O9eg0MmG2/dP6X+w4LzGv2ruC7lfwyf3MgWgYFyQ== dependencies: - "@budibase/backend-core" "2.0.22" - "@budibase/types" "2.0.22" + "@budibase/backend-core" "2.0.23" + "@budibase/types" "2.0.23" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.22", "@budibase/types@^2.0.22": - version "2.0.22" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.22.tgz#c17d518294f1d53ad3251e659b5bd689f50914b0" - integrity sha512-qtNFWYbbdGQzmelkBO/22Xc1nug7m8C5D+ugwItV6J+qYJqcFAUPxjfTILYfICDDGiF3g9waA6+Y/JnFn9ujZg== +"@budibase/types@2.0.23", "@budibase/types@^2.0.23": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.23.tgz#2467342b9c48c965319182ef4cbb7166c8bf1e43" + integrity sha512-Oyq9tVwV+zl38III1or4Cr8VOKemMv3L/o95CBXdyZRDmmVfdzQgJ7AByUMOj9quEe6IjctdkOI4ssE8Fds9Dw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 286f65e9b4f2652c9ab4063d5e15ab9a67187dd0 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 6 Oct 2022 17:10:57 +0100 Subject: [PATCH 50/52] Updating yarn locks. --- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index e047b857b4..a340b6f01e 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.14-alpha.4": - version "2.0.14-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.4.tgz#213446a9e04385fb38ab8785742cdb8b4eaf2cac" - integrity sha512-ma1Ipst4AQVi4sx+ULs3bX9xT4eHqavCvM/BXtZzV23SOTdjJTi9wX2KWbIvAUT5xo2NgN0uRf5zf7B6CBRuXw== +"@budibase/backend-core@2.0.23": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.23.tgz#915d4ea2e78547795894b2aebd81b8a8c9b568db" + integrity sha512-wovJF+kS/vVs+cR6lHieEEs99vmXsOt5qKjMAkkMUVXmWBWPYQaLppz+dxTV9xXd8Ht9yFhnkbOo7QJxFE8+fA== dependencies: - "@budibase/types" "2.0.14-alpha.4" + "@budibase/types" "^2.0.23" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.14-alpha.4": - version "2.0.14-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.4.tgz#9796271365f4ffb875655f86df84a2b4111b793a" - integrity sha512-I5QIv04hfoUPEYHPkCD5L/5WU7cJurmfhjy62ZMTNbJzFzhIGDzQlOjM0MnQO5kJvGv1NWl2PQvSty1rYzXGsw== +"@budibase/pro@2.0.23": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.23.tgz#215759f07470d37b6571f54ad80d7fb38a2f902e" + integrity sha512-RP7lS076VP3W+9AI9d/ylM6k1YBotGlqkBrshgzX/pl1e2O9eg0MmG2/dP6X+w4LzGv2ruC7lfwyf3MgWgYFyQ== dependencies: - "@budibase/backend-core" "2.0.14-alpha.4" - "@budibase/types" "2.0.14-alpha.4" + "@budibase/backend-core" "2.0.23" + "@budibase/types" "2.0.23" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.14-alpha.4": - version "2.0.14-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.4.tgz#37b1ff362d2551fd978e8c8153a4cec357eda0b0" - integrity sha512-l4dfMh5it1N56nc+jCtdXklrZA1cMt6WSVBoKCXBedZGpguJr18Wo/cfn1YWryuUMuSlpFVDTrlQQXCZ+ku92g== +"@budibase/types@2.0.23", "@budibase/types@^2.0.23": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.23.tgz#2467342b9c48c965319182ef4cbb7166c8bf1e43" + integrity sha512-Oyq9tVwV+zl38III1or4Cr8VOKemMv3L/o95CBXdyZRDmmVfdzQgJ7AByUMOj9quEe6IjctdkOI4ssE8Fds9Dw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index d7532fdb50..f885ab690e 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.14-alpha.4": - version "2.0.14-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.4.tgz#213446a9e04385fb38ab8785742cdb8b4eaf2cac" - integrity sha512-ma1Ipst4AQVi4sx+ULs3bX9xT4eHqavCvM/BXtZzV23SOTdjJTi9wX2KWbIvAUT5xo2NgN0uRf5zf7B6CBRuXw== +"@budibase/backend-core@2.0.23": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.23.tgz#915d4ea2e78547795894b2aebd81b8a8c9b568db" + integrity sha512-wovJF+kS/vVs+cR6lHieEEs99vmXsOt5qKjMAkkMUVXmWBWPYQaLppz+dxTV9xXd8Ht9yFhnkbOo7QJxFE8+fA== dependencies: - "@budibase/types" "2.0.14-alpha.4" + "@budibase/types" "^2.0.23" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.14-alpha.4": - version "2.0.14-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.4.tgz#9796271365f4ffb875655f86df84a2b4111b793a" - integrity sha512-I5QIv04hfoUPEYHPkCD5L/5WU7cJurmfhjy62ZMTNbJzFzhIGDzQlOjM0MnQO5kJvGv1NWl2PQvSty1rYzXGsw== +"@budibase/pro@2.0.23": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.23.tgz#215759f07470d37b6571f54ad80d7fb38a2f902e" + integrity sha512-RP7lS076VP3W+9AI9d/ylM6k1YBotGlqkBrshgzX/pl1e2O9eg0MmG2/dP6X+w4LzGv2ruC7lfwyf3MgWgYFyQ== dependencies: - "@budibase/backend-core" "2.0.14-alpha.4" - "@budibase/types" "2.0.14-alpha.4" + "@budibase/backend-core" "2.0.23" + "@budibase/types" "2.0.23" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.14-alpha.4": - version "2.0.14-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.4.tgz#37b1ff362d2551fd978e8c8153a4cec357eda0b0" - integrity sha512-l4dfMh5it1N56nc+jCtdXklrZA1cMt6WSVBoKCXBedZGpguJr18Wo/cfn1YWryuUMuSlpFVDTrlQQXCZ+ku92g== +"@budibase/types@2.0.23", "@budibase/types@^2.0.23": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.23.tgz#2467342b9c48c965319182ef4cbb7166c8bf1e43" + integrity sha512-Oyq9tVwV+zl38III1or4Cr8VOKemMv3L/o95CBXdyZRDmmVfdzQgJ7AByUMOj9quEe6IjctdkOI4ssE8Fds9Dw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 6c6001692c437fb153f43b11b1d0b481e863f80c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 6 Oct 2022 16:40:43 +0000 Subject: [PATCH 51/52] v2.0.24-alpha.0 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index bc62b3c368..a8276de8cc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.23", + "version": "2.0.24-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a9c1e3eb59..90b645ff2c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.23", + "version": "2.0.24-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.0.23", + "@budibase/types": "2.0.24-alpha.0", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 3ca5585e34..803396fb35 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.0.23", + "version": "2.0.24-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.0.23", + "@budibase/string-templates": "2.0.24-alpha.0", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 6f289d3433..687b571b66 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.23", + "version": "2.0.24-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.0.23", - "@budibase/client": "^2.0.23", - "@budibase/frontend-core": "^2.0.23", - "@budibase/string-templates": "^2.0.23", + "@budibase/bbui": "2.0.24-alpha.0", + "@budibase/client": "2.0.24-alpha.0", + "@budibase/frontend-core": "2.0.24-alpha.0", + "@budibase/string-templates": "2.0.24-alpha.0", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index e054839f25..0d99b165f6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.23", + "version": "2.0.24-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.0.23", - "@budibase/string-templates": "^2.0.23", - "@budibase/types": "^2.0.23", + "@budibase/backend-core": "2.0.24-alpha.0", + "@budibase/string-templates": "2.0.24-alpha.0", + "@budibase/types": "2.0.24-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 f22039ae4f..7f662c557e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.23", + "version": "2.0.24-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.0.23", - "@budibase/frontend-core": "^2.0.23", - "@budibase/string-templates": "^2.0.23", + "@budibase/bbui": "2.0.24-alpha.0", + "@budibase/frontend-core": "2.0.24-alpha.0", + "@budibase/string-templates": "2.0.24-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 3942ad481b..4f1d618840 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.23", + "version": "2.0.24-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.0.23", + "@budibase/bbui": "2.0.24-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 59bd24e4ca..403fcf7cf5 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.23", + "version": "2.0.24-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 f22e992557..8a5929aa55 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.23", + "version": "2.0.24-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.0.23", - "@budibase/client": "^2.0.23", + "@budibase/backend-core": "2.0.24-alpha.0", + "@budibase/client": "2.0.24-alpha.0", "@budibase/pro": "2.0.23", - "@budibase/string-templates": "^2.0.23", - "@budibase/types": "^2.0.23", + "@budibase/string-templates": "2.0.24-alpha.0", + "@budibase/types": "2.0.24-alpha.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 651034e3fd..d08b74c36e 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.23", + "version": "2.0.24-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 8c1b53a33b..4f416ccf6c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.23", + "version": "2.0.24-alpha.0", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 9763d42abf..333fce92f3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.23", + "version": "2.0.24-alpha.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.0.23", + "@budibase/backend-core": "2.0.24-alpha.0", "@budibase/pro": "2.0.23", - "@budibase/string-templates": "^2.0.23", - "@budibase/types": "^2.0.23", + "@budibase/string-templates": "2.0.24-alpha.0", + "@budibase/types": "2.0.24-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ac4d13e0cf9b79333e0600d7b97ce97b0de10d49 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 6 Oct 2022 16:43:54 +0000 Subject: [PATCH 52/52] Update pro version to 2.0.24-alpha.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 8a5929aa55..c55f7a8d60 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.0.24-alpha.0", "@budibase/client": "2.0.24-alpha.0", - "@budibase/pro": "2.0.23", + "@budibase/pro": "2.0.24-alpha.0", "@budibase/string-templates": "2.0.24-alpha.0", "@budibase/types": "2.0.24-alpha.0", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index a340b6f01e..b4adc8125d 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.23": - version "2.0.23" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.23.tgz#915d4ea2e78547795894b2aebd81b8a8c9b568db" - integrity sha512-wovJF+kS/vVs+cR6lHieEEs99vmXsOt5qKjMAkkMUVXmWBWPYQaLppz+dxTV9xXd8Ht9yFhnkbOo7QJxFE8+fA== +"@budibase/backend-core@2.0.24-alpha.0": + version "2.0.24-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.24-alpha.0.tgz#db53e562cd40aa21783f6f4d6eaf880ec8225a8f" + integrity sha512-o8Ooa5Ga3hcbovoO+Fjyp++TcJmt8v83Y7GfurLznjAc5lakdEe8RWKR9JV7xqenXpZ49ZwWYTSOLwxFBiJuvw== dependencies: - "@budibase/types" "^2.0.23" + "@budibase/types" "2.0.24-alpha.0" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.23": - version "2.0.23" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.23.tgz#215759f07470d37b6571f54ad80d7fb38a2f902e" - integrity sha512-RP7lS076VP3W+9AI9d/ylM6k1YBotGlqkBrshgzX/pl1e2O9eg0MmG2/dP6X+w4LzGv2ruC7lfwyf3MgWgYFyQ== +"@budibase/pro@2.0.24-alpha.0": + version "2.0.24-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.24-alpha.0.tgz#c7c70f431d9d17603d965b353dbb7c4956b6f7a0" + integrity sha512-bp+m9mXEonvxiLo4s9Gt4vhHuVrderFB4vfCISMRcIpZTo/CPVkMTOEM7C4liZyXOiLB9hh4Y+vQY1T6ilIr3Q== dependencies: - "@budibase/backend-core" "2.0.23" - "@budibase/types" "2.0.23" + "@budibase/backend-core" "2.0.24-alpha.0" + "@budibase/types" "2.0.24-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.23", "@budibase/types@^2.0.23": - version "2.0.23" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.23.tgz#2467342b9c48c965319182ef4cbb7166c8bf1e43" - integrity sha512-Oyq9tVwV+zl38III1or4Cr8VOKemMv3L/o95CBXdyZRDmmVfdzQgJ7AByUMOj9quEe6IjctdkOI4ssE8Fds9Dw== +"@budibase/types@2.0.24-alpha.0": + version "2.0.24-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.24-alpha.0.tgz#d5ff01dc4a6f1d584077b1808c0a6c8cffbd1eea" + integrity sha512-eiTumTQp6d9+bizhImqK+OJ4g4b9IuUTCOdNp7K2rwu0v94xxLuQEtJUA5MKiqClx7Uu27IlybeQmP+oM99gTg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 333fce92f3..61a4379f1b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.0.24-alpha.0", - "@budibase/pro": "2.0.23", + "@budibase/pro": "2.0.24-alpha.0", "@budibase/string-templates": "2.0.24-alpha.0", "@budibase/types": "2.0.24-alpha.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index f885ab690e..6dbb1e9cd1 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.23": - version "2.0.23" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.23.tgz#915d4ea2e78547795894b2aebd81b8a8c9b568db" - integrity sha512-wovJF+kS/vVs+cR6lHieEEs99vmXsOt5qKjMAkkMUVXmWBWPYQaLppz+dxTV9xXd8Ht9yFhnkbOo7QJxFE8+fA== +"@budibase/backend-core@2.0.24-alpha.0": + version "2.0.24-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.24-alpha.0.tgz#db53e562cd40aa21783f6f4d6eaf880ec8225a8f" + integrity sha512-o8Ooa5Ga3hcbovoO+Fjyp++TcJmt8v83Y7GfurLznjAc5lakdEe8RWKR9JV7xqenXpZ49ZwWYTSOLwxFBiJuvw== dependencies: - "@budibase/types" "^2.0.23" + "@budibase/types" "2.0.24-alpha.0" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.23": - version "2.0.23" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.23.tgz#215759f07470d37b6571f54ad80d7fb38a2f902e" - integrity sha512-RP7lS076VP3W+9AI9d/ylM6k1YBotGlqkBrshgzX/pl1e2O9eg0MmG2/dP6X+w4LzGv2ruC7lfwyf3MgWgYFyQ== +"@budibase/pro@2.0.24-alpha.0": + version "2.0.24-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.24-alpha.0.tgz#c7c70f431d9d17603d965b353dbb7c4956b6f7a0" + integrity sha512-bp+m9mXEonvxiLo4s9Gt4vhHuVrderFB4vfCISMRcIpZTo/CPVkMTOEM7C4liZyXOiLB9hh4Y+vQY1T6ilIr3Q== dependencies: - "@budibase/backend-core" "2.0.23" - "@budibase/types" "2.0.23" + "@budibase/backend-core" "2.0.24-alpha.0" + "@budibase/types" "2.0.24-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.23", "@budibase/types@^2.0.23": - version "2.0.23" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.23.tgz#2467342b9c48c965319182ef4cbb7166c8bf1e43" - integrity sha512-Oyq9tVwV+zl38III1or4Cr8VOKemMv3L/o95CBXdyZRDmmVfdzQgJ7AByUMOj9quEe6IjctdkOI4ssE8Fds9Dw== +"@budibase/types@2.0.24-alpha.0": + version "2.0.24-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.24-alpha.0.tgz#d5ff01dc4a6f1d584077b1808c0a6c8cffbd1eea" + integrity sha512-eiTumTQp6d9+bizhImqK+OJ4g4b9IuUTCOdNp7K2rwu0v94xxLuQEtJUA5MKiqClx7Uu27IlybeQmP+oM99gTg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0"