From 7918452c522610c27c020342aac2edbcdf00f18c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 5 Jul 2022 16:57:18 +0000 Subject: [PATCH 01/33] v1.0.219-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 | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index d4a28e80c..c4e57cdc6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.218", + "version": "1.0.219-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 915ba63ea..69c901495 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.218", + "version": "1.0.219-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": "^1.0.218", + "@budibase/types": "^1.0.219-alpha.0", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f6363db97..bb80981f5 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.218", + "version": "1.0.219-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": "^1.0.218", + "@budibase/string-templates": "^1.0.219-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 a1729e82d..58c11f88a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.218", + "version": "1.0.219-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.218", - "@budibase/client": "^1.0.218", - "@budibase/frontend-core": "^1.0.218", - "@budibase/string-templates": "^1.0.218", + "@budibase/bbui": "^1.0.219-alpha.0", + "@budibase/client": "^1.0.219-alpha.0", + "@budibase/frontend-core": "^1.0.219-alpha.0", + "@budibase/string-templates": "^1.0.219-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 dc15bf399..e8b8c11dd 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.218", + "version": "1.0.219-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 73ad09004..6607817ce 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.218", + "version": "1.0.219-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": "^1.0.218", - "@budibase/frontend-core": "^1.0.218", - "@budibase/string-templates": "^1.0.218", + "@budibase/bbui": "^1.0.219-alpha.0", + "@budibase/frontend-core": "^1.0.219-alpha.0", + "@budibase/string-templates": "^1.0.219-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 5d865435e..9570d3327 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.218", + "version": "1.0.219-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": "^1.0.218", + "@budibase/bbui": "^1.0.219-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 26649616c..12a94cb9f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.218", + "version": "1.0.219-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": "^1.0.218", - "@budibase/client": "^1.0.218", + "@budibase/backend-core": "^1.0.219-alpha.0", + "@budibase/client": "^1.0.219-alpha.0", "@budibase/pro": "1.0.218", - "@budibase/string-templates": "^1.0.218", - "@budibase/types": "^1.0.218", + "@budibase/string-templates": "^1.0.219-alpha.0", + "@budibase/types": "^1.0.219-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 b1bfcee92..0c0e1dc40 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.218", + "version": "1.0.219-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 4ad607db9..3be285c76 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.218", + "version": "1.0.219-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 bb22b7945..aca8d2ed9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.218", + "version": "1.0.219-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.218", + "@budibase/backend-core": "^1.0.219-alpha.0", "@budibase/pro": "1.0.218", - "@budibase/string-templates": "^1.0.218", - "@budibase/types": "^1.0.218", + "@budibase/string-templates": "^1.0.219-alpha.0", + "@budibase/types": "^1.0.219-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7b11c9e357fa51530543f4dad994432a32c12ac7 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 5 Jul 2022 16:58:48 +0000 Subject: [PATCH 02/33] Update pro version to 1.0.219-alpha.0 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 12a94cb9f..8a31e8353 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.0", "@budibase/client": "^1.0.219-alpha.0", - "@budibase/pro": "1.0.218", + "@budibase/pro": "1.0.219-alpha.0", "@budibase/string-templates": "^1.0.219-alpha.0", "@budibase/types": "^1.0.219-alpha.0", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index aca8d2ed9..fdfa10f6c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.0", - "@budibase/pro": "1.0.218", + "@budibase/pro": "1.0.219-alpha.0", "@budibase/string-templates": "^1.0.219-alpha.0", "@budibase/types": "^1.0.219-alpha.0", "@koa/router": "8.0.8", From bceff77e35135502df8437c1b3d255b8ab673327 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 6 Jul 2022 11:51:48 +0100 Subject: [PATCH 03/33] Properly invalidate the cached user ensuring up-to-date credentials are always used --- packages/backend-core/src/auth.js | 4 ++++ packages/server/src/threads/query.js | 17 ++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/backend-core/src/auth.js b/packages/backend-core/src/auth.js index b6d6a2027..b60144a0d 100644 --- a/packages/backend-core/src/auth.js +++ b/packages/backend-core/src/auth.js @@ -20,6 +20,8 @@ const { internalApi, } = require("./middleware") +const { invalidateUser } = require("./cache/user") + // Strategies passport.use(new LocalStrategy(local.options, local.authenticate)) passport.use(new JwtStrategy(jwt.options, jwt.authenticate)) @@ -149,6 +151,8 @@ async function updateUserOAuth(userId, oAuthConfig) { } await db.put(dbUser) + + await invalidateUser(userId) } catch (e) { console.error("Could not update OAuth details for current user", e) } diff --git a/packages/server/src/threads/query.js b/packages/server/src/threads/query.js index e85fde970..fa5cc3aa6 100644 --- a/packages/server/src/threads/query.js +++ b/packages/server/src/threads/query.js @@ -8,6 +8,7 @@ const { refreshOAuthToken, updateUserOAuth, } = require("@budibase/backend-core/auth") +const { user: userCache } = require("@budibase/backend-core/cache") const { getGlobalIDFromUserMetadataID } = require("../db/utils") const { isSQL } = require("../integrations/utils") @@ -112,15 +113,9 @@ class QueryRunner { info.code === 401 && !this.hasRefreshedOAuth ) { + await this.refreshOAuth2(this.ctx) // Attempt to refresh the access token from the provider this.hasRefreshedOAuth = true - const authResponse = await this.refreshOAuth2(this.ctx) - - if (!authResponse || authResponse.err) { - // In this event the user may have oAuth issues that - // could require re-authenticating with their provider. - throw new Error("OAuth2 access token could not be refreshed") - } } this.hasRerun = true @@ -174,8 +169,7 @@ class QueryRunner { const { configId } = ctx.auth if (!providerType || !oauth2?.refreshToken) { - console.error("No refresh token found for authenticated user") - return + throw new Error("No refresh token found for authenticated user") } const resp = await refreshOAuthToken( @@ -189,6 +183,11 @@ class QueryRunner { if (!resp.error) { const globalUserId = getGlobalIDFromUserMetadataID(_id) await updateUserOAuth(globalUserId, resp) + this.ctx.user = await userCache.getUser(globalUserId) + } else { + // In this event the user may have oAuth issues that + // could require re-authenticating with their provider. + throw new Error("OAuth2 access token could not be refreshed") } return resp From 457a671831d8431776020ed2acbd2193cc9f24d8 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 6 Jul 2022 13:03:25 +0100 Subject: [PATCH 04/33] Surface refresh process error messaging --- packages/server/src/threads/query.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/src/threads/query.js b/packages/server/src/threads/query.js index fa5cc3aa6..366155ece 100644 --- a/packages/server/src/threads/query.js +++ b/packages/server/src/threads/query.js @@ -180,14 +180,14 @@ class QueryRunner { // Refresh session flow. Should be in same location as refreshOAuthToken // There are several other properties available in 'resp' - if (!resp.error) { + if (!resp.err) { const globalUserId = getGlobalIDFromUserMetadataID(_id) await updateUserOAuth(globalUserId, resp) this.ctx.user = await userCache.getUser(globalUserId) } else { // In this event the user may have oAuth issues that // could require re-authenticating with their provider. - throw new Error("OAuth2 access token could not be refreshed") + throw new Error("OAuth2 access token could not be refreshed: " + resp.err.toString()) } return resp From 36d69a0b81f79ee0d993f9c5d95d9cb5dab56668 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 6 Jul 2022 13:09:13 +0100 Subject: [PATCH 05/33] Linting commit --- packages/server/src/threads/query.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/server/src/threads/query.js b/packages/server/src/threads/query.js index 366155ece..7c94c3d25 100644 --- a/packages/server/src/threads/query.js +++ b/packages/server/src/threads/query.js @@ -187,7 +187,9 @@ class QueryRunner { } else { // In this event the user may have oAuth issues that // could require re-authenticating with their provider. - throw new Error("OAuth2 access token could not be refreshed: " + resp.err.toString()) + throw new Error( + "OAuth2 access token could not be refreshed: " + resp.err.toString() + ) } return resp From 58d9fc1384c304fb9c442b7605745512ba4c70d9 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 12:16:08 +0000 Subject: [PATCH 06/33] v1.0.219-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index c4e57cdc6..9f3e343a5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.0", + "version": "1.0.219-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 69c901495..c8accc407 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.0", + "version": "1.0.219-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.0", + "@budibase/types": "^1.0.219-alpha.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index bb80981f5..b232a95dc 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.0", + "version": "1.0.219-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.0", + "@budibase/string-templates": "^1.0.219-alpha.1", "@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 58c11f88a..38b12c287 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.0", + "version": "1.0.219-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.0", - "@budibase/client": "^1.0.219-alpha.0", - "@budibase/frontend-core": "^1.0.219-alpha.0", - "@budibase/string-templates": "^1.0.219-alpha.0", + "@budibase/bbui": "^1.0.219-alpha.1", + "@budibase/client": "^1.0.219-alpha.1", + "@budibase/frontend-core": "^1.0.219-alpha.1", + "@budibase/string-templates": "^1.0.219-alpha.1", "@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 e8b8c11dd..61046d567 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.0", + "version": "1.0.219-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 6607817ce..8ff5c9e18 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.0", + "version": "1.0.219-alpha.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.0", - "@budibase/frontend-core": "^1.0.219-alpha.0", - "@budibase/string-templates": "^1.0.219-alpha.0", + "@budibase/bbui": "^1.0.219-alpha.1", + "@budibase/frontend-core": "^1.0.219-alpha.1", + "@budibase/string-templates": "^1.0.219-alpha.1", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 9570d3327..255a31096 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.0", + "version": "1.0.219-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.0", + "@budibase/bbui": "^1.0.219-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 8a31e8353..767a30ec8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.0", + "version": "1.0.219-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.0", - "@budibase/client": "^1.0.219-alpha.0", + "@budibase/backend-core": "^1.0.219-alpha.1", + "@budibase/client": "^1.0.219-alpha.1", "@budibase/pro": "1.0.219-alpha.0", - "@budibase/string-templates": "^1.0.219-alpha.0", - "@budibase/types": "^1.0.219-alpha.0", + "@budibase/string-templates": "^1.0.219-alpha.1", + "@budibase/types": "^1.0.219-alpha.1", "@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 0c0e1dc40..bd585344e 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.0", + "version": "1.0.219-alpha.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 3be285c76..a3f073561 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.0", + "version": "1.0.219-alpha.1", "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 fdfa10f6c..70366f90f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.0", + "version": "1.0.219-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.0", + "@budibase/backend-core": "^1.0.219-alpha.1", "@budibase/pro": "1.0.219-alpha.0", - "@budibase/string-templates": "^1.0.219-alpha.0", - "@budibase/types": "^1.0.219-alpha.0", + "@budibase/string-templates": "^1.0.219-alpha.1", + "@budibase/types": "^1.0.219-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From e3b81c6fc25e332af86e4afedadfc97460c4273e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 12:17:39 +0000 Subject: [PATCH 07/33] Update pro version to 1.0.219-alpha.1 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 767a30ec8..f89c74605 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.1", "@budibase/client": "^1.0.219-alpha.1", - "@budibase/pro": "1.0.219-alpha.0", + "@budibase/pro": "1.0.219-alpha.1", "@budibase/string-templates": "^1.0.219-alpha.1", "@budibase/types": "^1.0.219-alpha.1", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 70366f90f..ae5309d08 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.1", - "@budibase/pro": "1.0.219-alpha.0", + "@budibase/pro": "1.0.219-alpha.1", "@budibase/string-templates": "^1.0.219-alpha.1", "@budibase/types": "^1.0.219-alpha.1", "@koa/router": "8.0.8", From 12a8487732cf02a8cd0658177526dc6fed708a1f Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 6 Jul 2022 13:36:29 +0100 Subject: [PATCH 08/33] Adding null parameter so that TS doesn't build with strict requirement. --- packages/backend-core/src/logging.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend-core/src/logging.js b/packages/backend-core/src/logging.js index 6ab5bff44..425d7f813 100644 --- a/packages/backend-core/src/logging.js +++ b/packages/backend-core/src/logging.js @@ -4,7 +4,7 @@ function isSuppressed(e) { return e && e["suppressAlert"] } -module.exports.logAlert = (message, e) => { +module.exports.logAlert = (message, e = null) => { if (e && NonErrors.includes(e.name) && isSuppressed(e)) { return } From 6cc8db45a9ce7450f10c0c09777a9bdecd26b686 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 12:36:37 +0000 Subject: [PATCH 09/33] v1.0.219-alpha.2 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 9f3e343a5..2095c8b22 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.1", + "version": "1.0.219-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index c8accc407..ceea64a60 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.1", + "version": "1.0.219-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.1", + "@budibase/types": "^1.0.219-alpha.2", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index b232a95dc..1bc475584 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.1", + "version": "1.0.219-alpha.2", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.1", + "@budibase/string-templates": "^1.0.219-alpha.2", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 38b12c287..43aa38345 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.1", + "version": "1.0.219-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.1", - "@budibase/client": "^1.0.219-alpha.1", - "@budibase/frontend-core": "^1.0.219-alpha.1", - "@budibase/string-templates": "^1.0.219-alpha.1", + "@budibase/bbui": "^1.0.219-alpha.2", + "@budibase/client": "^1.0.219-alpha.2", + "@budibase/frontend-core": "^1.0.219-alpha.2", + "@budibase/string-templates": "^1.0.219-alpha.2", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 61046d567..9faa5334f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.1", + "version": "1.0.219-alpha.2", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 8ff5c9e18..3a4bc0cf9 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.1", + "version": "1.0.219-alpha.2", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.1", - "@budibase/frontend-core": "^1.0.219-alpha.1", - "@budibase/string-templates": "^1.0.219-alpha.1", + "@budibase/bbui": "^1.0.219-alpha.2", + "@budibase/frontend-core": "^1.0.219-alpha.2", + "@budibase/string-templates": "^1.0.219-alpha.2", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 255a31096..7d2ef8aaf 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.1", + "version": "1.0.219-alpha.2", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.1", + "@budibase/bbui": "^1.0.219-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index f89c74605..6f6481c1a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.1", + "version": "1.0.219-alpha.2", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.1", - "@budibase/client": "^1.0.219-alpha.1", + "@budibase/backend-core": "^1.0.219-alpha.2", + "@budibase/client": "^1.0.219-alpha.2", "@budibase/pro": "1.0.219-alpha.1", - "@budibase/string-templates": "^1.0.219-alpha.1", - "@budibase/types": "^1.0.219-alpha.1", + "@budibase/string-templates": "^1.0.219-alpha.2", + "@budibase/types": "^1.0.219-alpha.2", "@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 bd585344e..3d983b376 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.1", + "version": "1.0.219-alpha.2", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index a3f073561..9f453e8d4 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.1", + "version": "1.0.219-alpha.2", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index ae5309d08..6d457e054 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.1", + "version": "1.0.219-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.1", + "@budibase/backend-core": "^1.0.219-alpha.2", "@budibase/pro": "1.0.219-alpha.1", - "@budibase/string-templates": "^1.0.219-alpha.1", - "@budibase/types": "^1.0.219-alpha.1", + "@budibase/string-templates": "^1.0.219-alpha.2", + "@budibase/types": "^1.0.219-alpha.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 50abf0869e24f3d8dde101219239eff184535164 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 12:48:30 +0000 Subject: [PATCH 10/33] v1.0.219-alpha.3 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 2095c8b22..e803a4dad 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.2", + "version": "1.0.219-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ceea64a60..fb369a67e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.2", + "version": "1.0.219-alpha.3", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.2", + "@budibase/types": "^1.0.219-alpha.3", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 1bc475584..0e28f500f 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.2", + "version": "1.0.219-alpha.3", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.2", + "@budibase/string-templates": "^1.0.219-alpha.3", "@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 43aa38345..dda6d0700 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.2", + "version": "1.0.219-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.2", - "@budibase/client": "^1.0.219-alpha.2", - "@budibase/frontend-core": "^1.0.219-alpha.2", - "@budibase/string-templates": "^1.0.219-alpha.2", + "@budibase/bbui": "^1.0.219-alpha.3", + "@budibase/client": "^1.0.219-alpha.3", + "@budibase/frontend-core": "^1.0.219-alpha.3", + "@budibase/string-templates": "^1.0.219-alpha.3", "@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 9faa5334f..510f09079 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.2", + "version": "1.0.219-alpha.3", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 3a4bc0cf9..c9bf0bd10 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.2", + "version": "1.0.219-alpha.3", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.2", - "@budibase/frontend-core": "^1.0.219-alpha.2", - "@budibase/string-templates": "^1.0.219-alpha.2", + "@budibase/bbui": "^1.0.219-alpha.3", + "@budibase/frontend-core": "^1.0.219-alpha.3", + "@budibase/string-templates": "^1.0.219-alpha.3", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 7d2ef8aaf..c69606283 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.2", + "version": "1.0.219-alpha.3", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.2", + "@budibase/bbui": "^1.0.219-alpha.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 6f6481c1a..0a273fa5c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.2", + "version": "1.0.219-alpha.3", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.2", - "@budibase/client": "^1.0.219-alpha.2", + "@budibase/backend-core": "^1.0.219-alpha.3", + "@budibase/client": "^1.0.219-alpha.3", "@budibase/pro": "1.0.219-alpha.1", - "@budibase/string-templates": "^1.0.219-alpha.2", - "@budibase/types": "^1.0.219-alpha.2", + "@budibase/string-templates": "^1.0.219-alpha.3", + "@budibase/types": "^1.0.219-alpha.3", "@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 3d983b376..1c47e1f78 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.2", + "version": "1.0.219-alpha.3", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 9f453e8d4..6d640ebc5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.2", + "version": "1.0.219-alpha.3", "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 6d457e054..4b944b449 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.2", + "version": "1.0.219-alpha.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.2", + "@budibase/backend-core": "^1.0.219-alpha.3", "@budibase/pro": "1.0.219-alpha.1", - "@budibase/string-templates": "^1.0.219-alpha.2", - "@budibase/types": "^1.0.219-alpha.2", + "@budibase/string-templates": "^1.0.219-alpha.3", + "@budibase/types": "^1.0.219-alpha.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7fcb354cc26e1ae6dc21b3f41acc2abe0ade58f8 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 12:49:59 +0000 Subject: [PATCH 11/33] Update pro version to 1.0.219-alpha.3 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 0a273fa5c..af72a7250 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.3", "@budibase/client": "^1.0.219-alpha.3", - "@budibase/pro": "1.0.219-alpha.1", + "@budibase/pro": "1.0.219-alpha.3", "@budibase/string-templates": "^1.0.219-alpha.3", "@budibase/types": "^1.0.219-alpha.3", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 4b944b449..718119ce7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.3", - "@budibase/pro": "1.0.219-alpha.1", + "@budibase/pro": "1.0.219-alpha.3", "@budibase/string-templates": "^1.0.219-alpha.3", "@budibase/types": "^1.0.219-alpha.3", "@koa/router": "8.0.8", From 35ed1baecac48d1f222d4668b33f8262ea2ff160 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 6 Jul 2022 14:04:04 +0100 Subject: [PATCH 12/33] Updating logging to typescript to fix build issue. --- packages/backend-core/src/{logging.js => logging.ts} | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) rename packages/backend-core/src/{logging.js => logging.ts} (72%) diff --git a/packages/backend-core/src/logging.js b/packages/backend-core/src/logging.ts similarity index 72% rename from packages/backend-core/src/logging.js rename to packages/backend-core/src/logging.ts index 425d7f813..68c3307b2 100644 --- a/packages/backend-core/src/logging.js +++ b/packages/backend-core/src/logging.ts @@ -1,10 +1,10 @@ const NonErrors = ["AccountError"] -function isSuppressed(e) { +function isSuppressed(e?: any) { return e && e["suppressAlert"] } -module.exports.logAlert = (message, e = null) => { +export function logAlert(message: string, e?: any) { if (e && NonErrors.includes(e.name) && isSuppressed(e)) { return } @@ -14,3 +14,7 @@ module.exports.logAlert = (message, e = null) => { } console.error(`bb-alert: ${message} ${errorJson}`) } + +export default { + logAlert, +} From c9f92c3407eccba4fe55b9ae36c7f406c1b30fc3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 13:14:14 +0000 Subject: [PATCH 13/33] v1.0.219-alpha.4 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index e803a4dad..c09909fee 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.3", + "version": "1.0.219-alpha.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index fb369a67e..a2a2dcba4 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.3", + "version": "1.0.219-alpha.4", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.3", + "@budibase/types": "^1.0.219-alpha.4", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 0e28f500f..fccfe931f 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.3", + "version": "1.0.219-alpha.4", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.3", + "@budibase/string-templates": "^1.0.219-alpha.4", "@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 dda6d0700..9ac12795a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.3", + "version": "1.0.219-alpha.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.3", - "@budibase/client": "^1.0.219-alpha.3", - "@budibase/frontend-core": "^1.0.219-alpha.3", - "@budibase/string-templates": "^1.0.219-alpha.3", + "@budibase/bbui": "^1.0.219-alpha.4", + "@budibase/client": "^1.0.219-alpha.4", + "@budibase/frontend-core": "^1.0.219-alpha.4", + "@budibase/string-templates": "^1.0.219-alpha.4", "@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 510f09079..132b84b52 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.3", + "version": "1.0.219-alpha.4", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index c9bf0bd10..3f31fc062 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.3", + "version": "1.0.219-alpha.4", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.3", - "@budibase/frontend-core": "^1.0.219-alpha.3", - "@budibase/string-templates": "^1.0.219-alpha.3", + "@budibase/bbui": "^1.0.219-alpha.4", + "@budibase/frontend-core": "^1.0.219-alpha.4", + "@budibase/string-templates": "^1.0.219-alpha.4", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index c69606283..6e5868027 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.3", + "version": "1.0.219-alpha.4", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.3", + "@budibase/bbui": "^1.0.219-alpha.4", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index af72a7250..b6454ad5e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.3", + "version": "1.0.219-alpha.4", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.3", - "@budibase/client": "^1.0.219-alpha.3", + "@budibase/backend-core": "^1.0.219-alpha.4", + "@budibase/client": "^1.0.219-alpha.4", "@budibase/pro": "1.0.219-alpha.3", - "@budibase/string-templates": "^1.0.219-alpha.3", - "@budibase/types": "^1.0.219-alpha.3", + "@budibase/string-templates": "^1.0.219-alpha.4", + "@budibase/types": "^1.0.219-alpha.4", "@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 1c47e1f78..69f13e9c2 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.3", + "version": "1.0.219-alpha.4", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 6d640ebc5..c584e755c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.3", + "version": "1.0.219-alpha.4", "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 718119ce7..0d0742989 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.3", + "version": "1.0.219-alpha.4", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.3", + "@budibase/backend-core": "^1.0.219-alpha.4", "@budibase/pro": "1.0.219-alpha.3", - "@budibase/string-templates": "^1.0.219-alpha.3", - "@budibase/types": "^1.0.219-alpha.3", + "@budibase/string-templates": "^1.0.219-alpha.4", + "@budibase/types": "^1.0.219-alpha.4", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 3f58a6aadf2d44e272b239ce4901825828972fae Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 13:15:48 +0000 Subject: [PATCH 14/33] Update pro version to 1.0.219-alpha.4 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index b6454ad5e..b3080d89f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.4", "@budibase/client": "^1.0.219-alpha.4", - "@budibase/pro": "1.0.219-alpha.3", + "@budibase/pro": "1.0.219-alpha.4", "@budibase/string-templates": "^1.0.219-alpha.4", "@budibase/types": "^1.0.219-alpha.4", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 0d0742989..51c812c67 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.4", - "@budibase/pro": "1.0.219-alpha.3", + "@budibase/pro": "1.0.219-alpha.4", "@budibase/string-templates": "^1.0.219-alpha.4", "@budibase/types": "^1.0.219-alpha.4", "@koa/router": "8.0.8", From 8e24b85b245b2ed8ca578a5471e1430c03fa7057 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Wed, 6 Jul 2022 15:56:02 +0100 Subject: [PATCH 15/33] Smoke Build Test Changes Changes have been made to the following test files to remove smoke build failures: - addRadioButtons.spec.js - accountPortals.spec.js - userManagement.spec.js - userSettings.spec.js --- packages/builder/cypress/integration/addRadioButtons.spec.js | 4 ++++ .../integration/adminAndManagement/accountPortals.spec.js | 5 +++-- .../integration/adminAndManagement/userManagement.spec.js | 2 +- .../integration/adminAndManagement/userSettings.spec.js | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/builder/cypress/integration/addRadioButtons.spec.js b/packages/builder/cypress/integration/addRadioButtons.spec.js index 8f5b1a527..402db195a 100644 --- a/packages/builder/cypress/integration/addRadioButtons.spec.js +++ b/packages/builder/cypress/integration/addRadioButtons.spec.js @@ -36,5 +36,9 @@ filterTests(['all'], () => { }) cy.addCustomSourceOptions(totalRadioButtons) } + + after(() => { + cy.deleteAllApps() + }) }) }) diff --git a/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js b/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js index c615b2b4e..491a4abc4 100644 --- a/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js @@ -9,10 +9,11 @@ filterTests(["smoke", "all"], () => { before(() => { cy.login() cy.deleteApp("Cypress Tests") - cy.createApp("Cypress Tests") + cy.createApp("Cypress Tests", false) // Create new user - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 1000}) + cy.wait(500) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000}) cy.createUser(bbUserEmail) cy.contains("bbuser").click() cy.wait(500) diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js index 3c2308613..8e42f8cb8 100644 --- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js @@ -10,7 +10,7 @@ filterTests(["smoke", "all"], () => { }) it("should create a user via basic onboarding", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 1000}) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000}) cy.createUser("bbuser@test.com") cy.get(interact.SPECTRUM_TABLE).should("contain", "bbuser") }) diff --git a/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js b/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js index 782727562..95af9f784 100644 --- a/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js @@ -103,6 +103,8 @@ filterTests(["smoke", "all"], () => { } cy.get("button").contains("Update password").click({ force: true }) }) + // Remove users name + cy.updateUserInformation() }) }) }) From 377bbe9c5295a193f2423a6d1e02b0a5a1cef7b0 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Wed, 6 Jul 2022 16:17:58 +0100 Subject: [PATCH 16/33] CreateApp test file update A few timing issues that need sorted. There may be more after this as they tend to be linear through the test run --- packages/builder/cypress/integration/createApp.spec.js | 5 +++-- packages/builder/cypress/support/commands.js | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/builder/cypress/integration/createApp.spec.js b/packages/builder/cypress/integration/createApp.spec.js index 00c875e4f..ca52c66e3 100644 --- a/packages/builder/cypress/integration/createApp.spec.js +++ b/packages/builder/cypress/integration/createApp.spec.js @@ -51,7 +51,8 @@ filterTests(['smoke', 'all'], () => { cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 }) // Start create app process. If apps already exist, click second button - cy.get(interact.CREATE_APP_BUTTON, { timeout: 1000 }).click({ force: true }) + cy.wait(1000) + cy.get(interact.CREATE_APP_BUTTON, { timeout: 3000 }).click({ force: true }) const appName = "Cypress Tests" cy.get(interact.SPECTRUM_MODAL).within(() => { @@ -86,7 +87,7 @@ filterTests(['smoke', 'all'], () => { const appName = "Cypress Tests" cy.createApp(appName, false) - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) cy.applicationInAppTable(appName) cy.deleteApp(appName) diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index 9d77b89c5..16bb11ea8 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -135,6 +135,7 @@ Cypress.Commands.add("createApp", (name, addDefaultTable) => { typeof addDefaultTable != "boolean" ? true : addDefaultTable cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) + cy.wait(1000) cy.get(`[data-cy="create-app-btn"]`, { timeout: 2000 }).click({ force: true }) // If apps already exist From 4840f5c44badbf521181bcaae8491b1468b9887b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 15:42:23 +0000 Subject: [PATCH 17/33] v1.0.219-alpha.5 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index c09909fee..6deaedfa0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.4", + "version": "1.0.219-alpha.5", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a2a2dcba4..0a31a10cc 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.4", + "version": "1.0.219-alpha.5", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.4", + "@budibase/types": "^1.0.219-alpha.5", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index fccfe931f..45879c130 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.4", + "version": "1.0.219-alpha.5", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.4", + "@budibase/string-templates": "^1.0.219-alpha.5", "@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 9ac12795a..2a1928054 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.4", + "version": "1.0.219-alpha.5", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.4", - "@budibase/client": "^1.0.219-alpha.4", - "@budibase/frontend-core": "^1.0.219-alpha.4", - "@budibase/string-templates": "^1.0.219-alpha.4", + "@budibase/bbui": "^1.0.219-alpha.5", + "@budibase/client": "^1.0.219-alpha.5", + "@budibase/frontend-core": "^1.0.219-alpha.5", + "@budibase/string-templates": "^1.0.219-alpha.5", "@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 132b84b52..b2044e5b7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.4", + "version": "1.0.219-alpha.5", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 3f31fc062..d3acc1e6e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.4", + "version": "1.0.219-alpha.5", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.4", - "@budibase/frontend-core": "^1.0.219-alpha.4", - "@budibase/string-templates": "^1.0.219-alpha.4", + "@budibase/bbui": "^1.0.219-alpha.5", + "@budibase/frontend-core": "^1.0.219-alpha.5", + "@budibase/string-templates": "^1.0.219-alpha.5", "@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 6e5868027..e20d44780 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.4", + "version": "1.0.219-alpha.5", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.4", + "@budibase/bbui": "^1.0.219-alpha.5", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index b3080d89f..418d8b049 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.4", + "version": "1.0.219-alpha.5", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.4", - "@budibase/client": "^1.0.219-alpha.4", + "@budibase/backend-core": "^1.0.219-alpha.5", + "@budibase/client": "^1.0.219-alpha.5", "@budibase/pro": "1.0.219-alpha.4", - "@budibase/string-templates": "^1.0.219-alpha.4", - "@budibase/types": "^1.0.219-alpha.4", + "@budibase/string-templates": "^1.0.219-alpha.5", + "@budibase/types": "^1.0.219-alpha.5", "@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 69f13e9c2..6e368c6e1 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.4", + "version": "1.0.219-alpha.5", "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 c584e755c..e5bb70f8e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.4", + "version": "1.0.219-alpha.5", "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 51c812c67..18ee79b9e 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.4", + "version": "1.0.219-alpha.5", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.4", + "@budibase/backend-core": "^1.0.219-alpha.5", "@budibase/pro": "1.0.219-alpha.4", - "@budibase/string-templates": "^1.0.219-alpha.4", - "@budibase/types": "^1.0.219-alpha.4", + "@budibase/string-templates": "^1.0.219-alpha.5", + "@budibase/types": "^1.0.219-alpha.5", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 5d67e16c3abf6d81be69cb21259da4b99fdd0793 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 15:44:18 +0000 Subject: [PATCH 18/33] Update pro version to 1.0.219-alpha.5 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 418d8b049..fecc825ab 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.5", "@budibase/client": "^1.0.219-alpha.5", - "@budibase/pro": "1.0.219-alpha.4", + "@budibase/pro": "1.0.219-alpha.5", "@budibase/string-templates": "^1.0.219-alpha.5", "@budibase/types": "^1.0.219-alpha.5", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 18ee79b9e..1b517475c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.5", - "@budibase/pro": "1.0.219-alpha.4", + "@budibase/pro": "1.0.219-alpha.5", "@budibase/string-templates": "^1.0.219-alpha.5", "@budibase/types": "^1.0.219-alpha.5", "@koa/router": "8.0.8", From a4bbdd39dbe9ab49556223b1d5aa4739dfe64015 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Wed, 6 Jul 2022 17:32:27 +0100 Subject: [PATCH 19/33] Smoke build test changes This time it is adding appropriate deleteAllApps commands and adding waits - The waits seem to be essential for the smoke build. - Tests pass locally, but timing issues causes failure on the smoke build --- .../integration/adminAndManagement/userManagement.spec.js | 7 ++++--- packages/builder/cypress/integration/appOverview.spec.js | 1 + .../builder/cypress/integration/appPublishWorkflow.spec.js | 3 ++- .../builder/cypress/integration/datasources/mySql.spec.js | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js index 8e42f8cb8..08dac9f66 100644 --- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js @@ -6,7 +6,7 @@ filterTests(["smoke", "all"], () => { before(() => { cy.login() cy.deleteApp("Cypress Tests") - cy.createApp("Cypress Tests") + cy.createApp("Cypress Tests", false) }) it("should create a user via basic onboarding", () => { @@ -45,7 +45,8 @@ filterTests(["smoke", "all"], () => { if(i < 1){ cy.createApp(name) } else { - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000}) + cy.wait(500) cy.get(interact.CREATE_APP_BUTTON, { timeout: 1000 }).click({ force: true }) cy.createAppFromScratch(name) } @@ -53,7 +54,7 @@ filterTests(["smoke", "all"], () => { } }) // Navigate back to the user - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 500}) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000}) cy.get(interact.SPECTRUM_SIDENAV).contains("Users").click() cy.get(interact.SPECTRUM_TABLE, { timeout: 500 }).contains("bbuser").click() for (let i = 0; i < 3; i++) { diff --git a/packages/builder/cypress/integration/appOverview.spec.js b/packages/builder/cypress/integration/appOverview.spec.js index d718f95b9..f3a13deda 100644 --- a/packages/builder/cypress/integration/appOverview.spec.js +++ b/packages/builder/cypress/integration/appOverview.spec.js @@ -5,6 +5,7 @@ filterTests(["all"], () => { context("Application Overview screen", () => { before(() => { cy.login() + cy.deleteAllApps() cy.createTestApp() }) diff --git a/packages/builder/cypress/integration/appPublishWorkflow.spec.js b/packages/builder/cypress/integration/appPublishWorkflow.spec.js index e65c01c1b..0be847c19 100644 --- a/packages/builder/cypress/integration/appPublishWorkflow.spec.js +++ b/packages/builder/cypress/integration/appPublishWorkflow.spec.js @@ -6,7 +6,8 @@ filterTests(['all'], () => { context("Publish Application Workflow", () => { before(() => { cy.login() - cy.createTestApp() + cy.deleteAllApps() + cy.createApp("Cypress Tests", false) }) it("Should reflect the unpublished status correctly", () => { diff --git a/packages/builder/cypress/integration/datasources/mySql.spec.js b/packages/builder/cypress/integration/datasources/mySql.spec.js index b79f5af9c..4c24ea928 100644 --- a/packages/builder/cypress/integration/datasources/mySql.spec.js +++ b/packages/builder/cypress/integration/datasources/mySql.spec.js @@ -111,6 +111,7 @@ filterTests(["all"], () => { // Save relationship & reload page cy.get(".spectrum-Button").contains("Save").click({ force: true }) cy.reload() + cy.wait(1000) }) // Confirm table length & relationship name cy.get(".spectrum-Table", { timeout: 1000 }) From 011f37f7c80692d857d89686a84fc2d29a09a126 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 16:57:35 +0000 Subject: [PATCH 20/33] v1.0.219-alpha.6 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 6deaedfa0..1732ada2b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.5", + "version": "1.0.219-alpha.6", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0a31a10cc..d86fe9eff 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.5", + "version": "1.0.219-alpha.6", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.5", + "@budibase/types": "^1.0.219-alpha.6", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 45879c130..2028941e6 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.5", + "version": "1.0.219-alpha.6", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.5", + "@budibase/string-templates": "^1.0.219-alpha.6", "@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 2a1928054..fdff276b5 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.5", + "version": "1.0.219-alpha.6", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.5", - "@budibase/client": "^1.0.219-alpha.5", - "@budibase/frontend-core": "^1.0.219-alpha.5", - "@budibase/string-templates": "^1.0.219-alpha.5", + "@budibase/bbui": "^1.0.219-alpha.6", + "@budibase/client": "^1.0.219-alpha.6", + "@budibase/frontend-core": "^1.0.219-alpha.6", + "@budibase/string-templates": "^1.0.219-alpha.6", "@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 b2044e5b7..b1c63f786 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.5", + "version": "1.0.219-alpha.6", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index d3acc1e6e..147f84106 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.5", + "version": "1.0.219-alpha.6", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.5", - "@budibase/frontend-core": "^1.0.219-alpha.5", - "@budibase/string-templates": "^1.0.219-alpha.5", + "@budibase/bbui": "^1.0.219-alpha.6", + "@budibase/frontend-core": "^1.0.219-alpha.6", + "@budibase/string-templates": "^1.0.219-alpha.6", "@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 e20d44780..2c21aa379 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.5", + "version": "1.0.219-alpha.6", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.5", + "@budibase/bbui": "^1.0.219-alpha.6", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index fecc825ab..b0b028657 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.5", + "version": "1.0.219-alpha.6", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.5", - "@budibase/client": "^1.0.219-alpha.5", + "@budibase/backend-core": "^1.0.219-alpha.6", + "@budibase/client": "^1.0.219-alpha.6", "@budibase/pro": "1.0.219-alpha.5", - "@budibase/string-templates": "^1.0.219-alpha.5", - "@budibase/types": "^1.0.219-alpha.5", + "@budibase/string-templates": "^1.0.219-alpha.6", + "@budibase/types": "^1.0.219-alpha.6", "@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 6e368c6e1..35fdde234 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.5", + "version": "1.0.219-alpha.6", "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 e5bb70f8e..b5f758eac 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.5", + "version": "1.0.219-alpha.6", "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 1b517475c..535a26b98 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.5", + "version": "1.0.219-alpha.6", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.5", + "@budibase/backend-core": "^1.0.219-alpha.6", "@budibase/pro": "1.0.219-alpha.5", - "@budibase/string-templates": "^1.0.219-alpha.5", - "@budibase/types": "^1.0.219-alpha.5", + "@budibase/string-templates": "^1.0.219-alpha.6", + "@budibase/types": "^1.0.219-alpha.6", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 4db53953f284a4609f3de3a3d4c0a9a4f1127bf0 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 16:59:08 +0000 Subject: [PATCH 21/33] Update pro version to 1.0.219-alpha.6 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index b0b028657..56aa9df3a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.6", "@budibase/client": "^1.0.219-alpha.6", - "@budibase/pro": "1.0.219-alpha.5", + "@budibase/pro": "1.0.219-alpha.6", "@budibase/string-templates": "^1.0.219-alpha.6", "@budibase/types": "^1.0.219-alpha.6", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 535a26b98..2440852c9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.6", - "@budibase/pro": "1.0.219-alpha.5", + "@budibase/pro": "1.0.219-alpha.6", "@budibase/string-templates": "^1.0.219-alpha.6", "@budibase/types": "^1.0.219-alpha.6", "@koa/router": "8.0.8", From 7dfe0c0fc30f620418ccd7c44ce655a611a00e4d Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Wed, 6 Jul 2022 21:10:34 +0100 Subject: [PATCH 22/33] Cypress: Smoke Build Timing based Changes Still some timing issues against the smoke build, but less this time. - Mainly adding timeouts against cy.visit - Improving some structure with the close modal command in a few places --- packages/builder/cypress.json | 4 ++-- .../adminAndManagement/userManagement.spec.js | 16 +++++++++------- .../cypress/integration/appOverview.spec.js | 7 ++++--- .../integration/appPublishWorkflow.spec.js | 9 ++++++--- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/packages/builder/cypress.json b/packages/builder/cypress.json index 46f85a52c..844b77666 100644 --- a/packages/builder/cypress.json +++ b/packages/builder/cypress.json @@ -13,7 +13,7 @@ "HOST_IP": "" }, "retries": { - "runMode": 1, + "runMode": 0, "openMode": 0 } -} +} \ No newline at end of file diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js index 08dac9f66..a8ba27f7a 100644 --- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js @@ -174,14 +174,16 @@ filterTests(["smoke", "all"], () => { it("Should edit user details within user details page", () => { // Add First name - cy.get(interact.FIELD, { timeout: 500 }).eq(2).within(() => { - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 500 }).type("bb") + cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => { + cy.wait(500) + cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().type("bb") }) // Add Last name - cy.get(interact.FIELD).eq(3).within(() => { - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).type("test") + cy.get(interact.FIELD, { timeout: 1000 }).eq(3).within(() => { + cy.wait(500) + cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().type("test") }) - cy.get(interact.FIELD).eq(0).click() + cy.get(interact.FIELD, { timeout: 1000 }).eq(0).click() // Reload page cy.reload() @@ -189,8 +191,8 @@ filterTests(["smoke", "all"], () => { cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => { cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', "bb") }) - cy.get(interact.FIELD).eq(3).within(() => { - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 500 }).should('have.value', "test") + cy.get(interact.FIELD, { timeout: 1000 }).eq(3).within(() => { + cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).should('have.value', "test") }) }) diff --git a/packages/builder/cypress/integration/appOverview.spec.js b/packages/builder/cypress/integration/appOverview.spec.js index f3a13deda..9a08f7204 100644 --- a/packages/builder/cypress/integration/appOverview.spec.js +++ b/packages/builder/cypress/integration/appOverview.spec.js @@ -301,7 +301,7 @@ filterTests(["all"], () => { }) it("Should allow editing of the app details.", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) cy.get(".appTable .app-row-actions button") .contains("Manage") .eq(0) @@ -316,7 +316,8 @@ filterTests(["all"], () => { cy.updateAppName("sample name") //publish and check its disabled - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) + cy.wait(500) cy.get(".appTable .app-row-actions button") .contains("Edit") .eq(0) @@ -332,7 +333,7 @@ filterTests(["all"], () => { cy.wait(1000) }) - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) cy.get(".appTable .app-row-actions button", { timeout: 1000 }) .contains("Manage") .eq(0) diff --git a/packages/builder/cypress/integration/appPublishWorkflow.spec.js b/packages/builder/cypress/integration/appPublishWorkflow.spec.js index 0be847c19..edca7ee3a 100644 --- a/packages/builder/cypress/integration/appPublishWorkflow.spec.js +++ b/packages/builder/cypress/integration/appPublishWorkflow.spec.js @@ -11,7 +11,7 @@ filterTests(['all'], () => { }) it("Should reflect the unpublished status correctly", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) cy.get(interact.APP_TABLE_STATUS, { timeout: 3000 }).eq(0) .within(() => { @@ -30,6 +30,7 @@ filterTests(['all'], () => { it("Should publish an application and correctly reflect that", () => { //Assuming the previous test was run and the unpublished app is open in edit mode. + cy.closeModal() cy.get(interact.TOPRIGHTNAV_BUTTON_SPECTRUM).contains("Publish").click({ force : true }) cy.get(interact.DEPLOY_APP_MODAL).should("be.visible") @@ -73,7 +74,7 @@ filterTests(['all'], () => { it("Should unpublish an application using the link and reflect the status change", () => { //Assuming the previous test app exists and is published - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) cy.get(interact.APP_TABLE_STATUS).eq(0) .within(() => { @@ -86,6 +87,7 @@ filterTests(['all'], () => { cy.get(interact.APP_TABLE_APP_NAME).click({ force: true }) }) + cy.closeModal() cy.get(interact.DEPLOYMENT_TOP_GLOBE).should("exist").click({ force: true }) cy.get("[data-cy='publish-popover-menu']") @@ -98,7 +100,8 @@ filterTests(['all'], () => { cy.get(interact.CONFIRM_WRAP_BUTTON).click({ force: true } )}) - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 6000 }) + cy.wait(500) cy.get(interact.APP_TABLE_STATUS, { timeout: 1000 }).eq(0).contains("Unpublished") }) From 57e5d6fa3b84deffdd8ec86c3b1b9ff8ebaab101 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 20:56:34 +0000 Subject: [PATCH 23/33] v1.0.219-alpha.7 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 1732ada2b..49a7e0698 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.6", + "version": "1.0.219-alpha.7", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d86fe9eff..549ba4e81 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.6", + "version": "1.0.219-alpha.7", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.6", + "@budibase/types": "^1.0.219-alpha.7", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 2028941e6..343193eda 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.6", + "version": "1.0.219-alpha.7", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.6", + "@budibase/string-templates": "^1.0.219-alpha.7", "@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 fdff276b5..5751c2af4 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.6", + "version": "1.0.219-alpha.7", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.6", - "@budibase/client": "^1.0.219-alpha.6", - "@budibase/frontend-core": "^1.0.219-alpha.6", - "@budibase/string-templates": "^1.0.219-alpha.6", + "@budibase/bbui": "^1.0.219-alpha.7", + "@budibase/client": "^1.0.219-alpha.7", + "@budibase/frontend-core": "^1.0.219-alpha.7", + "@budibase/string-templates": "^1.0.219-alpha.7", "@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 b1c63f786..1a07a4bd7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.6", + "version": "1.0.219-alpha.7", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 147f84106..f1586d6f4 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.6", + "version": "1.0.219-alpha.7", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.6", - "@budibase/frontend-core": "^1.0.219-alpha.6", - "@budibase/string-templates": "^1.0.219-alpha.6", + "@budibase/bbui": "^1.0.219-alpha.7", + "@budibase/frontend-core": "^1.0.219-alpha.7", + "@budibase/string-templates": "^1.0.219-alpha.7", "@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 2c21aa379..f5b1d2abb 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.6", + "version": "1.0.219-alpha.7", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.6", + "@budibase/bbui": "^1.0.219-alpha.7", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 56aa9df3a..0b9d7f168 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.6", + "version": "1.0.219-alpha.7", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.6", - "@budibase/client": "^1.0.219-alpha.6", + "@budibase/backend-core": "^1.0.219-alpha.7", + "@budibase/client": "^1.0.219-alpha.7", "@budibase/pro": "1.0.219-alpha.6", - "@budibase/string-templates": "^1.0.219-alpha.6", - "@budibase/types": "^1.0.219-alpha.6", + "@budibase/string-templates": "^1.0.219-alpha.7", + "@budibase/types": "^1.0.219-alpha.7", "@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 35fdde234..860c44ec4 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.6", + "version": "1.0.219-alpha.7", "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 b5f758eac..72a0047e8 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.6", + "version": "1.0.219-alpha.7", "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 2440852c9..0df729051 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.6", + "version": "1.0.219-alpha.7", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.6", + "@budibase/backend-core": "^1.0.219-alpha.7", "@budibase/pro": "1.0.219-alpha.6", - "@budibase/string-templates": "^1.0.219-alpha.6", - "@budibase/types": "^1.0.219-alpha.6", + "@budibase/string-templates": "^1.0.219-alpha.7", + "@budibase/types": "^1.0.219-alpha.7", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From e90bafa41f7545d3a525263ad5011f8cb49caf97 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 6 Jul 2022 20:58:00 +0000 Subject: [PATCH 24/33] Update pro version to 1.0.219-alpha.7 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 0b9d7f168..641619371 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.7", "@budibase/client": "^1.0.219-alpha.7", - "@budibase/pro": "1.0.219-alpha.6", + "@budibase/pro": "1.0.219-alpha.7", "@budibase/string-templates": "^1.0.219-alpha.7", "@budibase/types": "^1.0.219-alpha.7", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 0df729051..b00bc4259 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.7", - "@budibase/pro": "1.0.219-alpha.6", + "@budibase/pro": "1.0.219-alpha.7", "@budibase/string-templates": "^1.0.219-alpha.7", "@budibase/types": "^1.0.219-alpha.7", "@koa/router": "8.0.8", From 9a7e5ba830f9c26617a6488cdab73529f79a2c15 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Thu, 7 Jul 2022 11:07:05 +0100 Subject: [PATCH 25/33] Smoke Build Changes - Timing issues Timing issues persist for the smoke build. Increasing timeout values to try and combat this --- packages/builder/cypress.json | 2 +- .../adminAndManagement/userManagement.spec.js | 4 ++-- .../builder/cypress/integration/appOverview.spec.js | 4 ++-- .../integration/datasources/postgreSql.spec.js | 2 +- .../cypress/integration/renameAnApplication.spec.js | 13 +++++-------- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/packages/builder/cypress.json b/packages/builder/cypress.json index 844b77666..f1eada481 100644 --- a/packages/builder/cypress.json +++ b/packages/builder/cypress.json @@ -13,7 +13,7 @@ "HOST_IP": "" }, "retries": { - "runMode": 0, + "runMode": 1, "openMode": 0 } } \ No newline at end of file diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js index a8ba27f7a..e4be5e3be 100644 --- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js @@ -46,8 +46,8 @@ filterTests(["smoke", "all"], () => { cy.createApp(name) } else { cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000}) - cy.wait(500) - cy.get(interact.CREATE_APP_BUTTON, { timeout: 1000 }).click({ force: true }) + cy.wait(1000) + cy.get(interact.CREATE_APP_BUTTON, { timeout: 2000 }).click({ force: true }) cy.createAppFromScratch(name) } } diff --git a/packages/builder/cypress/integration/appOverview.spec.js b/packages/builder/cypress/integration/appOverview.spec.js index 9a08f7204..5856786bc 100644 --- a/packages/builder/cypress/integration/appOverview.spec.js +++ b/packages/builder/cypress/integration/appOverview.spec.js @@ -333,8 +333,8 @@ filterTests(["all"], () => { cy.wait(1000) }) - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - cy.get(".appTable .app-row-actions button", { timeout: 1000 }) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 }) + cy.get(".appTable .app-row-actions button", { timeout: 5000 }) .contains("Manage") .eq(0) .click({ force: true }) diff --git a/packages/builder/cypress/integration/datasources/postgreSql.spec.js b/packages/builder/cypress/integration/datasources/postgreSql.spec.js index de959e203..598055225 100644 --- a/packages/builder/cypress/integration/datasources/postgreSql.spec.js +++ b/packages/builder/cypress/integration/datasources/postgreSql.spec.js @@ -151,7 +151,7 @@ filterTests(["all"], () => { cy.get("@query").its("response.body").should("not.be.empty") // Save query cy.get(".spectrum-Button").contains("Save Query").click({ force: true }) - cy.get(".hierarchy-items-container").should("contain", queryName) + cy.get(".spectrum-Tabs-content", { timeout: 2000 }).should("contain", queryName) }) it("should switch to schema with no tables", () => { diff --git a/packages/builder/cypress/integration/renameAnApplication.spec.js b/packages/builder/cypress/integration/renameAnApplication.spec.js index 370efadff..4460750b0 100644 --- a/packages/builder/cypress/integration/renameAnApplication.spec.js +++ b/packages/builder/cypress/integration/renameAnApplication.spec.js @@ -12,7 +12,7 @@ filterTests(["all"], () => { const appName = "Cypress Tests" const appRename = "Cypress Renamed" // Rename app, Search for app, Confirm name was changed - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) renameApp(appName, appRename) cy.reload() cy.searchForApplication(appRename) @@ -39,7 +39,7 @@ filterTests(["all"], () => { .click({ force: true }) }) // Rename app, Search for app, Confirm name was changed - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) renameApp(appName, appRename, true) cy.get(interact.APP_TABLE).find(interact.WRAPPER).should("have.length", 1) cy.applicationInAppTable(appRename) @@ -47,7 +47,7 @@ filterTests(["all"], () => { it("Should try to rename an application to have no name", () => { const appName = "Cypress Tests" - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) renameApp(appName, " ", false, true) // Close modal and confirm name has not been changed cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 1000 }).contains("Cancel").click() @@ -57,7 +57,7 @@ filterTests(["all"], () => { xit("Should create two applications with the same name", () => { // It is not possible to have applications with the same name const appName = "Cypress Tests" - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) cy.get(interact.SPECTRUM_BUTTON), { timeout: 500 } .contains("Create app") .click({ force: true }) @@ -80,18 +80,15 @@ filterTests(["all"], () => { const appName = "Cypress Tests" const numberName = 12345 const specialCharName = "£$%^" - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) renameApp(appName, numberName) - cy.reload() cy.applicationInAppTable(numberName) - cy.reload() renameApp(numberName, specialCharName) cy.get(interact.ERROR).should( "have.text", "App name must be letters, numbers and spaces only" ) // Set app name back to Cypress Tests - cy.reload() renameApp(numberName, appName) }) From d006763b9f509ee4693f6c15ed9660d94b96d475 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 10:40:17 +0000 Subject: [PATCH 26/33] v1.0.219-alpha.8 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 49a7e0698..046b10e6a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 549ba4e81..731241922 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.7", + "@budibase/types": "^1.0.219-alpha.8", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 343193eda..e36b596fb 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.7", + "@budibase/string-templates": "^1.0.219-alpha.8", "@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 5751c2af4..3e9264fae 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.7", - "@budibase/client": "^1.0.219-alpha.7", - "@budibase/frontend-core": "^1.0.219-alpha.7", - "@budibase/string-templates": "^1.0.219-alpha.7", + "@budibase/bbui": "^1.0.219-alpha.8", + "@budibase/client": "^1.0.219-alpha.8", + "@budibase/frontend-core": "^1.0.219-alpha.8", + "@budibase/string-templates": "^1.0.219-alpha.8", "@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 1a07a4bd7..9051d54b7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index f1586d6f4..a503af0cb 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.7", - "@budibase/frontend-core": "^1.0.219-alpha.7", - "@budibase/string-templates": "^1.0.219-alpha.7", + "@budibase/bbui": "^1.0.219-alpha.8", + "@budibase/frontend-core": "^1.0.219-alpha.8", + "@budibase/string-templates": "^1.0.219-alpha.8", "@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 f5b1d2abb..d10cf3812 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.7", + "@budibase/bbui": "^1.0.219-alpha.8", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 641619371..dee7ffa7f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.7", - "@budibase/client": "^1.0.219-alpha.7", + "@budibase/backend-core": "^1.0.219-alpha.8", + "@budibase/client": "^1.0.219-alpha.8", "@budibase/pro": "1.0.219-alpha.7", - "@budibase/string-templates": "^1.0.219-alpha.7", - "@budibase/types": "^1.0.219-alpha.7", + "@budibase/string-templates": "^1.0.219-alpha.8", + "@budibase/types": "^1.0.219-alpha.8", "@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 860c44ec4..787db8a16 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "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 72a0047e8..c27eab7cc 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "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 b00bc4259..127ce5a2d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.7", + "@budibase/backend-core": "^1.0.219-alpha.8", "@budibase/pro": "1.0.219-alpha.7", - "@budibase/string-templates": "^1.0.219-alpha.7", - "@budibase/types": "^1.0.219-alpha.7", + "@budibase/string-templates": "^1.0.219-alpha.8", + "@budibase/types": "^1.0.219-alpha.8", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 0a4d3261624bc7437e69681d16765892cea54f9f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 10:41:47 +0000 Subject: [PATCH 27/33] Update pro version to 1.0.219-alpha.8 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index dee7ffa7f..21ce84829 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.8", "@budibase/client": "^1.0.219-alpha.8", - "@budibase/pro": "1.0.219-alpha.7", + "@budibase/pro": "1.0.219-alpha.8", "@budibase/string-templates": "^1.0.219-alpha.8", "@budibase/types": "^1.0.219-alpha.8", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 127ce5a2d..09f2ddb18 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.8", - "@budibase/pro": "1.0.219-alpha.7", + "@budibase/pro": "1.0.219-alpha.8", "@budibase/string-templates": "^1.0.219-alpha.8", "@budibase/types": "^1.0.219-alpha.8", "@koa/router": "8.0.8", From 00229a9fca73b5f4d5b17bbaf94b99f1a90bdc94 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 7 Jul 2022 12:02:13 +0100 Subject: [PATCH 28/33] Updating pro release script to fix dependencies. --- scripts/pro/release.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/pro/release.sh b/scripts/pro/release.sh index e08f27158..fc1d8132d 100755 --- a/scripts/pro/release.sh +++ b/scripts/pro/release.sh @@ -36,10 +36,11 @@ cd ../budibase-pro # Install NPM credentials echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc -# Sync backend-core version in packages/pro/package.json +# Sync budibase dependency versions in packages/pro/package.json # Ensures pro does not use out of date dependency cd packages/pro jq '.dependencies."@budibase/backend-core"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json +jq '.dependencies."@budibase/types"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json # Go back to pro repo root cd - @@ -91,4 +92,4 @@ cd - git add packages/server/package.json git add packages/worker/package.json git commit -m "Update pro version to $VERSION" -git push \ No newline at end of file +git push From b2f9898d0faef404230d6ae8ef5303032edd4b2b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 11:12:43 +0000 Subject: [PATCH 29/33] v1.0.219-alpha.9 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 046b10e6a..dcf4da894 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 731241922..15b2b6df5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.8", + "@budibase/types": "^1.0.219-alpha.9", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e36b596fb..686d358fc 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.8", + "@budibase/string-templates": "^1.0.219-alpha.9", "@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 3e9264fae..bd4f34f13 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.8", - "@budibase/client": "^1.0.219-alpha.8", - "@budibase/frontend-core": "^1.0.219-alpha.8", - "@budibase/string-templates": "^1.0.219-alpha.8", + "@budibase/bbui": "^1.0.219-alpha.9", + "@budibase/client": "^1.0.219-alpha.9", + "@budibase/frontend-core": "^1.0.219-alpha.9", + "@budibase/string-templates": "^1.0.219-alpha.9", "@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 9051d54b7..a666742eb 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index a503af0cb..1ee4e2443 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.8", - "@budibase/frontend-core": "^1.0.219-alpha.8", - "@budibase/string-templates": "^1.0.219-alpha.8", + "@budibase/bbui": "^1.0.219-alpha.9", + "@budibase/frontend-core": "^1.0.219-alpha.9", + "@budibase/string-templates": "^1.0.219-alpha.9", "@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 d10cf3812..ad0556c59 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.8", + "@budibase/bbui": "^1.0.219-alpha.9", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 21ce84829..0a557c785 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.8", - "@budibase/client": "^1.0.219-alpha.8", + "@budibase/backend-core": "^1.0.219-alpha.9", + "@budibase/client": "^1.0.219-alpha.9", "@budibase/pro": "1.0.219-alpha.8", - "@budibase/string-templates": "^1.0.219-alpha.8", - "@budibase/types": "^1.0.219-alpha.8", + "@budibase/string-templates": "^1.0.219-alpha.9", + "@budibase/types": "^1.0.219-alpha.9", "@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 787db8a16..33bd8710f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "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 c27eab7cc..fa0a50897 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "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 09f2ddb18..80cc21142 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.8", + "@budibase/backend-core": "^1.0.219-alpha.9", "@budibase/pro": "1.0.219-alpha.8", - "@budibase/string-templates": "^1.0.219-alpha.8", - "@budibase/types": "^1.0.219-alpha.8", + "@budibase/string-templates": "^1.0.219-alpha.9", + "@budibase/types": "^1.0.219-alpha.9", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 0dc7a827a0cc8f986bd4ba592331084d666795f5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 11:14:18 +0000 Subject: [PATCH 30/33] Update pro version to 1.0.219-alpha.9 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 0a557c785..79eb23a5b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.9", "@budibase/client": "^1.0.219-alpha.9", - "@budibase/pro": "1.0.219-alpha.8", + "@budibase/pro": "1.0.219-alpha.9", "@budibase/string-templates": "^1.0.219-alpha.9", "@budibase/types": "^1.0.219-alpha.9", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 80cc21142..63f44ad2b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.9", - "@budibase/pro": "1.0.219-alpha.8", + "@budibase/pro": "1.0.219-alpha.9", "@budibase/string-templates": "^1.0.219-alpha.9", "@budibase/types": "^1.0.219-alpha.9", "@koa/router": "8.0.8", From 025405c09f9d825e2c96c4a028f4f3940b59d656 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Thu, 7 Jul 2022 12:50:30 +0100 Subject: [PATCH 31/33] Cypress: User Details Test Fix It seems that at times, Cypress is running so fast that it does not type entire words (it sometimes misses the first couple of letters. I've put a small change in the userManagement test file to try and revolve this. - Adding a wait and clear in association with the type command --- .../integration/adminAndManagement/userManagement.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js index e4be5e3be..69f3c2ec1 100644 --- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js @@ -176,12 +176,12 @@ filterTests(["smoke", "all"], () => { // Add First name cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => { cy.wait(500) - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().type("bb") + cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).wait(500).clear().click().type("bb") }) // Add Last name cy.get(interact.FIELD, { timeout: 1000 }).eq(3).within(() => { cy.wait(500) - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().type("test") + cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().wait(500).clear().type("test") }) cy.get(interact.FIELD, { timeout: 1000 }).eq(0).click() // Reload page From ecc49c6225cbf1417ed2fb9a6899ac1aff95fe2c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 12:13:32 +0000 Subject: [PATCH 32/33] v1.0.219-alpha.10 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index dcf4da894..89ef3fccc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 15b2b6df5..01f0b319c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.9", + "@budibase/types": "^1.0.219-alpha.10", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 686d358fc..dc6dc27c6 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.9", + "@budibase/string-templates": "^1.0.219-alpha.10", "@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 bd4f34f13..ab580440a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.9", - "@budibase/client": "^1.0.219-alpha.9", - "@budibase/frontend-core": "^1.0.219-alpha.9", - "@budibase/string-templates": "^1.0.219-alpha.9", + "@budibase/bbui": "^1.0.219-alpha.10", + "@budibase/client": "^1.0.219-alpha.10", + "@budibase/frontend-core": "^1.0.219-alpha.10", + "@budibase/string-templates": "^1.0.219-alpha.10", "@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 a666742eb..c4836f72e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 1ee4e2443..861c6dd28 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.9", - "@budibase/frontend-core": "^1.0.219-alpha.9", - "@budibase/string-templates": "^1.0.219-alpha.9", + "@budibase/bbui": "^1.0.219-alpha.10", + "@budibase/frontend-core": "^1.0.219-alpha.10", + "@budibase/string-templates": "^1.0.219-alpha.10", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index ad0556c59..fae146a28 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.9", + "@budibase/bbui": "^1.0.219-alpha.10", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 79eb23a5b..3eaaac5b0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.9", - "@budibase/client": "^1.0.219-alpha.9", + "@budibase/backend-core": "^1.0.219-alpha.10", + "@budibase/client": "^1.0.219-alpha.10", "@budibase/pro": "1.0.219-alpha.9", - "@budibase/string-templates": "^1.0.219-alpha.9", - "@budibase/types": "^1.0.219-alpha.9", + "@budibase/string-templates": "^1.0.219-alpha.10", + "@budibase/types": "^1.0.219-alpha.10", "@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 33bd8710f..54c58262f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index fa0a50897..17aa127c9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "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 63f44ad2b..179944d25 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.9", + "@budibase/backend-core": "^1.0.219-alpha.10", "@budibase/pro": "1.0.219-alpha.9", - "@budibase/string-templates": "^1.0.219-alpha.9", - "@budibase/types": "^1.0.219-alpha.9", + "@budibase/string-templates": "^1.0.219-alpha.10", + "@budibase/types": "^1.0.219-alpha.10", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From c7e7fc25e9f5519c33b837d8dd8575e09a54ee61 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 12:15:04 +0000 Subject: [PATCH 33/33] Update pro version to 1.0.219-alpha.10 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 3eaaac5b0..9c1ece825 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.10", "@budibase/client": "^1.0.219-alpha.10", - "@budibase/pro": "1.0.219-alpha.9", + "@budibase/pro": "1.0.219-alpha.10", "@budibase/string-templates": "^1.0.219-alpha.10", "@budibase/types": "^1.0.219-alpha.10", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 179944d25..eac161513 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.10", - "@budibase/pro": "1.0.219-alpha.9", + "@budibase/pro": "1.0.219-alpha.10", "@budibase/string-templates": "^1.0.219-alpha.10", "@budibase/types": "^1.0.219-alpha.10", "@koa/router": "8.0.8",