From 62b5e08cdeff6b039b2029d53296a800538f0131 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Fri, 14 Apr 2023 10:25:38 +0100 Subject: [PATCH 01/22] primary test cases, level to number working already --- .../backend-core/src/security/permissions.ts | 2 +- .../src/security/tests/permissions.spec.ts | 74 +++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 packages/backend-core/src/security/tests/permissions.spec.ts diff --git a/packages/backend-core/src/security/permissions.ts b/packages/backend-core/src/security/permissions.ts index 42189bba0c..1daf7d7067 100644 --- a/packages/backend-core/src/security/permissions.ts +++ b/packages/backend-core/src/security/permissions.ts @@ -34,7 +34,7 @@ class Permission { } } -function levelToNumber(perm: PermissionLevel) { +export function levelToNumber(perm: PermissionLevel) { switch (perm) { // not everything has execute privileges case PermissionLevel.EXECUTE: diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts new file mode 100644 index 0000000000..e77394d947 --- /dev/null +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -0,0 +1,74 @@ +import { + doesHaveBasePermission, + getBuiltinPermissionByID, + isPermissionLevelHigherThanRead, + PermissionLevel, + PermissionType, + levelToNumber, +} from "../permissions" + +describe("levelToNumber", () => { + it("should return 0 for EXECUTE", () => { + expect(levelToNumber(PermissionLevel.EXECUTE)).toBe(0) + }) + + it("should return 1 for READ", () => { + expect(levelToNumber(PermissionLevel.READ)).toBe(1) + }) + + it("should return 2 for WRITE", () => { + expect(levelToNumber(PermissionLevel.WRITE)).toBe(2) + }) + + it("should return 3 for ADMIN", () => { + expect(levelToNumber(PermissionLevel.ADMIN)).toBe(3) + }) + + it("should return -1 for an unknown permission level", () => { + expect(levelToNumber("unknown" as PermissionLevel)).toBe(-1) + }) +}) +describe("getBuiltinPermissionByID", () => { + it("should return the correct permission object", () => { + const id = "123" + const permission = { _id: id, name: "Test Permission" } + expect(getBuiltinPermissionByID(id)).toEqual(permission) + expect(getBuiltinPermissionByID("456")).toBeUndefined() + }) +}) + +describe("doesHaveBasePermission", () => { + it("should return true if base permission has the required level", () => { + const permType = PermissionType.APP + const permLevel = PermissionLevel.READ + const rolesHierarchy = [ + { roleId: "role1", permissionId: "permission1" }, + { roleId: "role2", permissionId: "permission2" }, + ] + expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( + true + ) + }) + + it("should return false if base permission does not have the required level", () => { + const permType = PermissionType.APP + const permLevel = PermissionLevel.READ + const rolesHierarchy = [ + { roleId: "role1", permissionId: "permission1" }, + { roleId: "role2", permissionId: "permission2" }, + ] + expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( + false + ) + }) +}) + +describe("isPermissionLevelHigherThanRead", () => { + it("should return true if level is higher than read", () => { + expect(isPermissionLevelHigherThanRead(PermissionLevel.WRITE)).toBe(true) + }) + + it("should return false if level is read or lower", () => { + expect(isPermissionLevelHigherThanRead(PermissionLevel.READ)).toBe(false) + }) +}) From fa83c5d7a1dd77e34d967d764f7c07987b3e54a4 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Fri, 14 Apr 2023 10:29:52 +0100 Subject: [PATCH 02/22] added get allowed levels (not working yet) --- .../src/security/tests/permissions.spec.ts | 39 ++++++++++++++++--- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts index e77394d947..264e521f8b 100644 --- a/packages/backend-core/src/security/tests/permissions.spec.ts +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -5,6 +5,7 @@ import { PermissionLevel, PermissionType, levelToNumber, + getAllowedLevels, } from "../permissions" describe("levelToNumber", () => { @@ -28,12 +29,38 @@ describe("levelToNumber", () => { expect(levelToNumber("unknown" as PermissionLevel)).toBe(-1) }) }) -describe("getBuiltinPermissionByID", () => { - it("should return the correct permission object", () => { - const id = "123" - const permission = { _id: id, name: "Test Permission" } - expect(getBuiltinPermissionByID(id)).toEqual(permission) - expect(getBuiltinPermissionByID("456")).toBeUndefined() +describe("getAllowedLevels", () => { + it('should return ["execute"] for EXECUTE', () => { + expect(getAllowedLevels(PermissionLevel.EXECUTE)).toEqual([ + PermissionLevel.EXECUTE, + ]) + }) + + it('should return ["execute", "read"] for READ', () => { + expect(getAllowedLevels(PermissionLevel.READ)).toEqual([ + PermissionLevel.EXECUTE, + PermissionLevel.READ, + ]) + }) + + it('should return ["execute", "read", "write"] for WRITE', () => { + expect(getAllowedLevels(PermissionLevel.WRITE)).toEqual([ + PermissionLevel.EXECUTE, + PermissionLevel.READ, + PermissionLevel.WRITE, + ]) + }) + + it('should return ["execute", "read", "write"] for ADMIN', () => { + expect(getAllowedLevels(PermissionLevel.ADMIN)).toEqual([ + PermissionLevel.EXECUTE, + PermissionLevel.READ, + PermissionLevel.WRITE, + ]) + }) + + it("should return [] for an unknown permission level", () => { + expect(getAllowedLevels("unknown" as PermissionLevel)).toEqual([]) }) }) From 696eea9f92224cd6395d7a0821a100e7ae8911a4 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Fri, 14 Apr 2023 11:39:36 +0100 Subject: [PATCH 03/22] exporting function to test --- packages/backend-core/src/security/permissions.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/security/permissions.ts b/packages/backend-core/src/security/permissions.ts index 1daf7d7067..dfe7988f76 100644 --- a/packages/backend-core/src/security/permissions.ts +++ b/packages/backend-core/src/security/permissions.ts @@ -55,7 +55,7 @@ export function levelToNumber(perm: PermissionLevel) { * @param {string} userPermLevel The permission level of the user. * @return {string[]} All the permission levels this user is allowed to carry out. */ -function getAllowedLevels(userPermLevel: PermissionLevel) { +export function getAllowedLevels(userPermLevel: PermissionLevel): string[] { switch (userPermLevel) { case PermissionLevel.EXECUTE: return [PermissionLevel.EXECUTE] @@ -64,9 +64,9 @@ function getAllowedLevels(userPermLevel: PermissionLevel) { case PermissionLevel.WRITE: case PermissionLevel.ADMIN: return [ + PermissionLevel.EXECUTE, PermissionLevel.READ, PermissionLevel.WRITE, - PermissionLevel.EXECUTE, ] default: return [] From 038476523fd9a5c6fcfe2152cfddad99cc0fd2b9 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Fri, 14 Apr 2023 11:39:52 +0100 Subject: [PATCH 04/22] doesHaveBasePermission tests --- .../src/security/tests/permissions.spec.ts | 64 ++++++++++++------- 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts index 264e521f8b..621a662933 100644 --- a/packages/backend-core/src/security/tests/permissions.spec.ts +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -1,13 +1,21 @@ import { - doesHaveBasePermission, - getBuiltinPermissionByID, - isPermissionLevelHigherThanRead, + RoleHierarchy, PermissionLevel, PermissionType, levelToNumber, getAllowedLevels, + BuiltinPermissionID, + getBuiltinPermissions, + getBuiltinPermissionByID, + doesHaveBasePermission, + isPermissionLevelHigherThanRead, + BUILDER, } from "../permissions" +jest.mock("../permissions", () => ({ + // getTenantId: jest.fn(() => "budibase"), + // DEFAULT_TENANT_ID: "default", +})) describe("levelToNumber", () => { it("should return 0 for EXECUTE", () => { expect(levelToNumber(PermissionLevel.EXECUTE)).toBe(0) @@ -65,28 +73,38 @@ describe("getAllowedLevels", () => { }) describe("doesHaveBasePermission", () => { - it("should return true if base permission has the required level", () => { - const permType = PermissionType.APP - const permLevel = PermissionLevel.READ - const rolesHierarchy = [ - { roleId: "role1", permissionId: "permission1" }, - { roleId: "role2", permissionId: "permission2" }, - ] - expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( - true - ) + const rolesHierarchy: RoleHierarchy = [ + { permissionId: BuiltinPermissionID.READ_ONLY }, + ] + + it("should return true for read permission of read only role", () => { + expect( + doesHaveBasePermission( + PermissionType.TABLE, + PermissionLevel.READ, + rolesHierarchy + ) + ).toBe(true) }) - it("should return false if base permission does not have the required level", () => { - const permType = PermissionType.APP - const permLevel = PermissionLevel.READ - const rolesHierarchy = [ - { roleId: "role1", permissionId: "permission1" }, - { roleId: "role2", permissionId: "permission2" }, - ] - expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( - false - ) + it("should return false for write permission of read only role", () => { + expect( + doesHaveBasePermission( + PermissionType.TABLE, + PermissionLevel.WRITE, + rolesHierarchy + ) + ).toBe(false) + }) + + it("should return true for execute permission of public role", () => { + expect( + doesHaveBasePermission( + PermissionType.WEBHOOK, + PermissionLevel.EXECUTE, + rolesHierarchy + ) + ).toBe(true) }) }) From 2f98ce977254d86683c7de0bf4f77de29a230614 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Fri, 14 Apr 2023 11:45:27 +0100 Subject: [PATCH 05/22] reverting some breaking changes --- .../src/security/tests/permissions.spec.ts | 64 +++++++------------ 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts index 621a662933..264e521f8b 100644 --- a/packages/backend-core/src/security/tests/permissions.spec.ts +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -1,21 +1,13 @@ import { - RoleHierarchy, + doesHaveBasePermission, + getBuiltinPermissionByID, + isPermissionLevelHigherThanRead, PermissionLevel, PermissionType, levelToNumber, getAllowedLevels, - BuiltinPermissionID, - getBuiltinPermissions, - getBuiltinPermissionByID, - doesHaveBasePermission, - isPermissionLevelHigherThanRead, - BUILDER, } from "../permissions" -jest.mock("../permissions", () => ({ - // getTenantId: jest.fn(() => "budibase"), - // DEFAULT_TENANT_ID: "default", -})) describe("levelToNumber", () => { it("should return 0 for EXECUTE", () => { expect(levelToNumber(PermissionLevel.EXECUTE)).toBe(0) @@ -73,38 +65,28 @@ describe("getAllowedLevels", () => { }) describe("doesHaveBasePermission", () => { - const rolesHierarchy: RoleHierarchy = [ - { permissionId: BuiltinPermissionID.READ_ONLY }, - ] - - it("should return true for read permission of read only role", () => { - expect( - doesHaveBasePermission( - PermissionType.TABLE, - PermissionLevel.READ, - rolesHierarchy - ) - ).toBe(true) + it("should return true if base permission has the required level", () => { + const permType = PermissionType.APP + const permLevel = PermissionLevel.READ + const rolesHierarchy = [ + { roleId: "role1", permissionId: "permission1" }, + { roleId: "role2", permissionId: "permission2" }, + ] + expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( + true + ) }) - it("should return false for write permission of read only role", () => { - expect( - doesHaveBasePermission( - PermissionType.TABLE, - PermissionLevel.WRITE, - rolesHierarchy - ) - ).toBe(false) - }) - - it("should return true for execute permission of public role", () => { - expect( - doesHaveBasePermission( - PermissionType.WEBHOOK, - PermissionLevel.EXECUTE, - rolesHierarchy - ) - ).toBe(true) + it("should return false if base permission does not have the required level", () => { + const permType = PermissionType.APP + const permLevel = PermissionLevel.READ + const rolesHierarchy = [ + { roleId: "role1", permissionId: "permission1" }, + { roleId: "role2", permissionId: "permission2" }, + ] + expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( + false + ) }) }) From 5180ac29d2a99122309f73b57cfa713b65223930 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Fri, 14 Apr 2023 12:16:01 +0100 Subject: [PATCH 06/22] final functions being tested --- .../backend-core/src/security/permissions.ts | 4 +- .../src/security/tests/permissions.spec.ts | 41 ++++++++++++++++--- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/packages/backend-core/src/security/permissions.ts b/packages/backend-core/src/security/permissions.ts index dfe7988f76..6cacc12dd6 100644 --- a/packages/backend-core/src/security/permissions.ts +++ b/packages/backend-core/src/security/permissions.ts @@ -24,7 +24,7 @@ export enum PermissionType { QUERY = "query", } -class Permission { +export class Permission { type: PermissionType level: PermissionLevel @@ -81,7 +81,7 @@ export enum BuiltinPermissionID { POWER = "power", } -const BUILTIN_PERMISSIONS = { +export const BUILTIN_PERMISSIONS = { PUBLIC: { _id: BuiltinPermissionID.PUBLIC, name: "Public", diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts index 264e521f8b..8f6ee76c81 100644 --- a/packages/backend-core/src/security/tests/permissions.spec.ts +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -1,3 +1,4 @@ +import { cloneDeep } from "lodash" import { doesHaveBasePermission, getBuiltinPermissionByID, @@ -6,7 +7,12 @@ import { PermissionType, levelToNumber, getAllowedLevels, + BuiltinPermissionID, + getBuiltinPermissions, + BUILTIN_PERMISSIONS, + Permission, } from "../permissions" +import { BUILTIN_ROLE_IDS } from "../roles" describe("levelToNumber", () => { it("should return 0 for EXECUTE", () => { @@ -66,11 +72,13 @@ describe("getAllowedLevels", () => { describe("doesHaveBasePermission", () => { it("should return true if base permission has the required level", () => { - const permType = PermissionType.APP + const permType = PermissionType.USER const permLevel = PermissionLevel.READ const rolesHierarchy = [ - { roleId: "role1", permissionId: "permission1" }, - { roleId: "role2", permissionId: "permission2" }, + { + roleId: BUILTIN_ROLE_IDS.ADMIN, + permissionId: BuiltinPermissionID.ADMIN, + }, ] expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( true @@ -81,8 +89,10 @@ describe("doesHaveBasePermission", () => { const permType = PermissionType.APP const permLevel = PermissionLevel.READ const rolesHierarchy = [ - { roleId: "role1", permissionId: "permission1" }, - { roleId: "role2", permissionId: "permission2" }, + { + roleId: BUILTIN_ROLE_IDS.PUBLIC, + permissionId: BuiltinPermissionID.PUBLIC, + }, ] expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( false @@ -99,3 +109,24 @@ describe("isPermissionLevelHigherThanRead", () => { expect(isPermissionLevelHigherThanRead(PermissionLevel.READ)).toBe(false) }) }) + +describe("getBuiltinPermissions", () => { + test("returns a clone of the builtin permissions", () => { + const builtins = getBuiltinPermissions() + expect(builtins).toEqual(cloneDeep(BUILTIN_PERMISSIONS)) + expect(builtins).not.toBe(BUILTIN_PERMISSIONS) + }) +}) + +describe("getBuiltinPermissionByID", () => { + test("returns correct permission object for valid ID", () => { + const expectedPermission = { + _id: BuiltinPermissionID.PUBLIC, + name: "Public", + permissions: [ + new Permission(PermissionType.WEBHOOK, PermissionLevel.EXECUTE), + ], + } + expect(getBuiltinPermissionByID("public")).toEqual(expectedPermission) + }) +}) From 09ccac12aefe57e212bf9cf71672cc51cc2ada84 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 14 Apr 2023 17:56:17 +0100 Subject: [PATCH 07/22] Fix for default values with NOT NULL requirements being intepreted as requiring values in the frontend, presence check is now ignored if a default or auto value is found. --- packages/server/scripts/integrations/mysql/init.sql | 2 +- .../server/scripts/integrations/postgres/init.sql | 1 + .../server/src/integrations/microsoftSqlServer.ts | 6 ++++-- packages/server/src/integrations/mysql.ts | 8 +++++--- packages/server/src/integrations/postgres.ts | 12 +++++++----- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/packages/server/scripts/integrations/mysql/init.sql b/packages/server/scripts/integrations/mysql/init.sql index 15269f2f41..ae5cd07788 100644 --- a/packages/server/scripts/integrations/mysql/init.sql +++ b/packages/server/scripts/integrations/mysql/init.sql @@ -3,7 +3,7 @@ USE main; CREATE TABLE Persons ( PersonID int NOT NULL AUTO_INCREMENT, CreatedAt datetime, - Age float, + Age float DEFAULT 20 NOT NULL, LastName varchar(255), FirstName varchar(255), Address varchar(255), diff --git a/packages/server/scripts/integrations/postgres/init.sql b/packages/server/scripts/integrations/postgres/init.sql index 78af4c20b9..057944101a 100644 --- a/packages/server/scripts/integrations/postgres/init.sql +++ b/packages/server/scripts/integrations/postgres/init.sql @@ -8,6 +8,7 @@ CREATE TABLE Persons ( FirstName varchar(255), Address varchar(255), City varchar(255) DEFAULT 'Belfast', + Age INTEGER DEFAULT 20 NOT NULL, Type person_job ); CREATE TABLE Tasks ( diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts index 2da190df5e..87da1ae81e 100644 --- a/packages/server/src/integrations/microsoftSqlServer.ts +++ b/packages/server/src/integrations/microsoftSqlServer.ts @@ -243,11 +243,13 @@ class SqlServerIntegration extends Sql implements DatasourcePlus { if (typeof name !== "string") { continue } + const isAuto = !!autoColumns.find(col => col === name) + const required = !!requiredColumns.find(col => col === name) schema[name] = { - autocolumn: !!autoColumns.find(col => col === name), + autocolumn: isAuto, name: name, constraints: { - presence: requiredColumns.find(col => col === name), + presence: required && !isAuto, }, ...convertSqlType(def.DATA_TYPE), externalType: def.DATA_TYPE, diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts index 080939593f..8d984ed402 100644 --- a/packages/server/src/integrations/mysql.ts +++ b/packages/server/src/integrations/mysql.ts @@ -229,13 +229,15 @@ class MySQLIntegration extends Sql implements DatasourcePlus { if (column.Key === "PRI" && primaryKeys.indexOf(column.Key) === -1) { primaryKeys.push(columnName) } - const constraints = { - presence: column.Null !== "YES", - } + const hasDefault = column.Default != null const isAuto: boolean = typeof column.Extra === "string" && (column.Extra === "auto_increment" || column.Extra.toLowerCase().includes("generated")) + const required = column.Null !== "YES" + const constraints = { + presence: required && !isAuto && !hasDefault, + } schema[columnName] = { name: columnName, autocolumn: isAuto, diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts index eba0d3691d..c981c3acc5 100644 --- a/packages/server/src/integrations/postgres.ts +++ b/packages/server/src/integrations/postgres.ts @@ -262,15 +262,17 @@ class PostgresIntegration extends Sql implements DatasourcePlus { column.identity_start || column.identity_increment ) - const constraints = { - presence: column.is_nullable === "NO", - } - const hasDefault = + const hasDefault = column.column_default != null + const hasNextVal = typeof column.column_default === "string" && column.column_default.startsWith("nextval") const isGenerated = column.is_generated && column.is_generated !== "NEVER" - const isAuto: boolean = hasDefault || identity || isGenerated + const isAuto: boolean = hasNextVal || identity || isGenerated + const required = column.is_nullable === "NO" + const constraints = { + presence: required && !hasDefault && !isGenerated, + } tables[tableName].schema[columnName] = { autocolumn: isAuto, name: columnName, From c552913737de15ec158493fedadc6221b835dc1d Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 14 Apr 2023 18:10:10 +0100 Subject: [PATCH 08/22] Fixing defaults in MS-SQL as well. --- .../integrations/mssql/data/entrypoint.sh | 1 + .../scripts/integrations/mssql/data/setup.sql | 34 +++++++++---------- .../src/integrations/microsoftSqlServer.ts | 3 +- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/packages/server/scripts/integrations/mssql/data/entrypoint.sh b/packages/server/scripts/integrations/mssql/data/entrypoint.sh index 04780d085e..ffe8d2cd5d 100644 --- a/packages/server/scripts/integrations/mssql/data/entrypoint.sh +++ b/packages/server/scripts/integrations/mssql/data/entrypoint.sh @@ -11,6 +11,7 @@ if [ "$1" = '/opt/mssql/bin/sqlservr' ]; then echo "RUNNING BUDIBASE SETUP" + cat setup.sql #run the setup script to create the DB and the schema in the DB /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Passw0rd -i setup.sql diff --git a/packages/server/scripts/integrations/mssql/data/setup.sql b/packages/server/scripts/integrations/mssql/data/setup.sql index 91c53cced7..a33a99cea5 100644 --- a/packages/server/scripts/integrations/mssql/data/setup.sql +++ b/packages/server/scripts/integrations/mssql/data/setup.sql @@ -34,7 +34,7 @@ GO CREATE TABLE people ( name varchar(30) NOT NULL, - age varchar(20), + age int default 20 NOT NULL, CONSTRAINT pk_people PRIMARY KEY NONCLUSTERED (name, age) ); @@ -50,22 +50,22 @@ VALUES ('Processing', 1); INSERT INTO people (name, age) -VALUES ('Bob', '30'), - ('Bert', '10'), - ('Jack', '12'), - ('Mike', '31'), - ('Dave', '44'), - ('Jim', '43'), - ('Kerry', '32'), - ('Julie', '12'), - ('Kim', '55'), - ('Andy', '33'), - ('John', '22'), - ('Ruth', '66'), - ('Robert', '88'), - ('Bobert', '99'), - ('Jan', '22'), - ('Megan', '11'); +VALUES ('Bob', 30), + ('Bert', 10), + ('Jack', 12), + ('Mike', 31), + ('Dave', 44), + ('Jim', 43), + ('Kerry', 32), + ('Julie', 12), + ('Kim', 55), + ('Andy', 33), + ('John', 22), + ('Ruth', 66), + ('Robert', 88), + ('Bobert', 99), + ('Jan', 22), + ('Megan', 11); IF OBJECT_ID ('Chains.sizes', 'U') IS NOT NULL diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts index 87da1ae81e..eb87c1ccf1 100644 --- a/packages/server/src/integrations/microsoftSqlServer.ts +++ b/packages/server/src/integrations/microsoftSqlServer.ts @@ -243,13 +243,14 @@ class SqlServerIntegration extends Sql implements DatasourcePlus { if (typeof name !== "string") { continue } + const hasDefault = def.COLUMN_DEFAULT const isAuto = !!autoColumns.find(col => col === name) const required = !!requiredColumns.find(col => col === name) schema[name] = { autocolumn: isAuto, name: name, constraints: { - presence: required && !isAuto, + presence: required && !isAuto && !hasDefault, }, ...convertSqlType(def.DATA_TYPE), externalType: def.DATA_TYPE, From 965a417a21e1ab5a15ce92573e265403212a4daf Mon Sep 17 00:00:00 2001 From: adrinr Date: Sun, 16 Apr 2023 18:45:09 +0100 Subject: [PATCH 09/22] Fix disabling fields on first load --- .../src/pages/builder/portal/users/groups/[groupId].svelte | 3 ++- .../src/pages/builder/portal/users/users/[userId].svelte | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte index bfb60f1c72..bbfd6998eb 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -75,7 +75,8 @@ let loaded = false let editModal, deleteModal - const scimEnabled = $features.isScimEnabled + let scimEnabled = false + $: scimEnabled = $features.isScimEnabled $: readonly = !$auth.isAdmin || scimEnabled $: page = $pageInfo.page diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte index d1ee48fd01..a890bd9a4a 100644 --- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte @@ -86,7 +86,8 @@ let user let loaded = false - const scimEnabled = $features.isScimEnabled + let scimEnabled = false + $: scimEnabled = $features.isScimEnabled $: isSSO = !!user?.provider $: readonly = !$auth.isAdmin || scimEnabled From 643ca614a447354dc9d56e2aa49b16cf1c1d6930 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Sun, 16 Apr 2023 22:27:02 +0100 Subject: [PATCH 10/22] changing test to it --- packages/backend-core/src/security/tests/permissions.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts index 8f6ee76c81..97c14879b3 100644 --- a/packages/backend-core/src/security/tests/permissions.spec.ts +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -111,7 +111,7 @@ describe("isPermissionLevelHigherThanRead", () => { }) describe("getBuiltinPermissions", () => { - test("returns a clone of the builtin permissions", () => { + it("returns a clone of the builtin permissions", () => { const builtins = getBuiltinPermissions() expect(builtins).toEqual(cloneDeep(BUILTIN_PERMISSIONS)) expect(builtins).not.toBe(BUILTIN_PERMISSIONS) @@ -119,7 +119,7 @@ describe("getBuiltinPermissions", () => { }) describe("getBuiltinPermissionByID", () => { - test("returns correct permission object for valid ID", () => { + it("returns correct permission object for valid ID", () => { const expectedPermission = { _id: BuiltinPermissionID.PUBLIC, name: "Public", From 4a67136c723eba42fb5164b5f746d232b1ed2a13 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 17 Apr 2023 09:49:11 +0100 Subject: [PATCH 11/22] Remove unnecessary initialisation --- .../src/pages/builder/portal/users/groups/[groupId].svelte | 2 -- .../src/pages/builder/portal/users/users/[userId].svelte | 2 -- 2 files changed, 4 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte index bbfd6998eb..1be019b83e 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -75,9 +75,7 @@ let loaded = false let editModal, deleteModal - let scimEnabled = false $: scimEnabled = $features.isScimEnabled - $: readonly = !$auth.isAdmin || scimEnabled $: page = $pageInfo.page $: fetchUsers(page, searchTerm) diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte index a890bd9a4a..98915eb960 100644 --- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte @@ -86,9 +86,7 @@ let user let loaded = false - let scimEnabled = false $: scimEnabled = $features.isScimEnabled - $: isSSO = !!user?.provider $: readonly = !$auth.isAdmin || scimEnabled $: privileged = user?.admin?.global || user?.builder?.global From de968b5332def45f26ea8e8fd0afebaecdccd283 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Mon, 17 Apr 2023 10:04:50 +0100 Subject: [PATCH 12/22] changin syntax to permission function --- .../src/security/tests/permissions.spec.ts | 119 ++++++++++-------- 1 file changed, 66 insertions(+), 53 deletions(-) diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts index 97c14879b3..caf8bb29a6 100644 --- a/packages/backend-core/src/security/tests/permissions.spec.ts +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -1,132 +1,145 @@ import { cloneDeep } from "lodash" -import { - doesHaveBasePermission, - getBuiltinPermissionByID, - isPermissionLevelHigherThanRead, - PermissionLevel, - PermissionType, - levelToNumber, - getAllowedLevels, - BuiltinPermissionID, - getBuiltinPermissions, - BUILTIN_PERMISSIONS, - Permission, -} from "../permissions" +import * as permissions from "../permissions" import { BUILTIN_ROLE_IDS } from "../roles" describe("levelToNumber", () => { it("should return 0 for EXECUTE", () => { - expect(levelToNumber(PermissionLevel.EXECUTE)).toBe(0) + expect(permissions.levelToNumber(permissions.PermissionLevel.EXECUTE)).toBe( + 0 + ) }) it("should return 1 for READ", () => { - expect(levelToNumber(PermissionLevel.READ)).toBe(1) + expect(permissions.levelToNumber(permissions.PermissionLevel.READ)).toBe(1) }) it("should return 2 for WRITE", () => { - expect(levelToNumber(PermissionLevel.WRITE)).toBe(2) + expect(permissions.levelToNumber(permissions.PermissionLevel.WRITE)).toBe(2) }) it("should return 3 for ADMIN", () => { - expect(levelToNumber(PermissionLevel.ADMIN)).toBe(3) + expect(permissions.levelToNumber(permissions.PermissionLevel.ADMIN)).toBe(3) }) it("should return -1 for an unknown permission level", () => { - expect(levelToNumber("unknown" as PermissionLevel)).toBe(-1) + expect( + permissions.levelToNumber("unknown" as permissions.PermissionLevel) + ).toBe(-1) }) }) describe("getAllowedLevels", () => { it('should return ["execute"] for EXECUTE', () => { - expect(getAllowedLevels(PermissionLevel.EXECUTE)).toEqual([ - PermissionLevel.EXECUTE, - ]) + expect( + permissions.getAllowedLevels(permissions.PermissionLevel.EXECUTE) + ).toEqual([permissions.PermissionLevel.EXECUTE]) }) it('should return ["execute", "read"] for READ', () => { - expect(getAllowedLevels(PermissionLevel.READ)).toEqual([ - PermissionLevel.EXECUTE, - PermissionLevel.READ, + expect( + permissions.getAllowedLevels(permissions.PermissionLevel.READ) + ).toEqual([ + permissions.PermissionLevel.EXECUTE, + permissions.PermissionLevel.READ, ]) }) it('should return ["execute", "read", "write"] for WRITE', () => { - expect(getAllowedLevels(PermissionLevel.WRITE)).toEqual([ - PermissionLevel.EXECUTE, - PermissionLevel.READ, - PermissionLevel.WRITE, + expect( + permissions.getAllowedLevels(permissions.PermissionLevel.WRITE) + ).toEqual([ + permissions.PermissionLevel.EXECUTE, + permissions.PermissionLevel.READ, + permissions.PermissionLevel.WRITE, ]) }) it('should return ["execute", "read", "write"] for ADMIN', () => { - expect(getAllowedLevels(PermissionLevel.ADMIN)).toEqual([ - PermissionLevel.EXECUTE, - PermissionLevel.READ, - PermissionLevel.WRITE, + expect( + permissions.getAllowedLevels(permissions.PermissionLevel.ADMIN) + ).toEqual([ + permissions.PermissionLevel.EXECUTE, + permissions.PermissionLevel.READ, + permissions.PermissionLevel.WRITE, ]) }) it("should return [] for an unknown permission level", () => { - expect(getAllowedLevels("unknown" as PermissionLevel)).toEqual([]) + expect( + permissions.getAllowedLevels("unknown" as permissions.PermissionLevel) + ).toEqual([]) }) }) describe("doesHaveBasePermission", () => { it("should return true if base permission has the required level", () => { - const permType = PermissionType.USER - const permLevel = PermissionLevel.READ + const permType = permissions.PermissionType.USER + const permLevel = permissions.PermissionLevel.READ const rolesHierarchy = [ { roleId: BUILTIN_ROLE_IDS.ADMIN, - permissionId: BuiltinPermissionID.ADMIN, + permissionId: permissions.BuiltinPermissionID.ADMIN, }, ] - expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( - true - ) + expect( + permissions.doesHaveBasePermission(permType, permLevel, rolesHierarchy) + ).toBe(true) }) it("should return false if base permission does not have the required level", () => { - const permType = PermissionType.APP - const permLevel = PermissionLevel.READ + const permType = permissions.PermissionType.APP + const permLevel = permissions.PermissionLevel.READ const rolesHierarchy = [ { roleId: BUILTIN_ROLE_IDS.PUBLIC, - permissionId: BuiltinPermissionID.PUBLIC, + permissionId: permissions.BuiltinPermissionID.PUBLIC, }, ] - expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( - false - ) + expect( + permissions.doesHaveBasePermission(permType, permLevel, rolesHierarchy) + ).toBe(false) }) }) describe("isPermissionLevelHigherThanRead", () => { it("should return true if level is higher than read", () => { - expect(isPermissionLevelHigherThanRead(PermissionLevel.WRITE)).toBe(true) + expect( + permissions.isPermissionLevelHigherThanRead( + permissions.PermissionLevel.WRITE + ) + ).toBe(true) }) it("should return false if level is read or lower", () => { - expect(isPermissionLevelHigherThanRead(PermissionLevel.READ)).toBe(false) + expect( + permissions.isPermissionLevelHigherThanRead( + permissions.PermissionLevel.READ + ) + ).toBe(false) }) }) describe("getBuiltinPermissions", () => { it("returns a clone of the builtin permissions", () => { - const builtins = getBuiltinPermissions() - expect(builtins).toEqual(cloneDeep(BUILTIN_PERMISSIONS)) - expect(builtins).not.toBe(BUILTIN_PERMISSIONS) + const builtins = permissions.getBuiltinPermissions() + expect(builtins).toEqual(cloneDeep(permissions.BUILTIN_PERMISSIONS)) + expect(builtins).not.toBe(permissions.BUILTIN_PERMISSIONS) }) }) describe("getBuiltinPermissionByID", () => { it("returns correct permission object for valid ID", () => { const expectedPermission = { - _id: BuiltinPermissionID.PUBLIC, + _id: permissions.BuiltinPermissionID.PUBLIC, name: "Public", permissions: [ - new Permission(PermissionType.WEBHOOK, PermissionLevel.EXECUTE), + new permissions.Permission( + permissions.PermissionType.WEBHOOK, + permissions.PermissionLevel.EXECUTE + ), ], } - expect(getBuiltinPermissionByID("public")).toEqual(expectedPermission) + expect(permissions.getBuiltinPermissionByID("public")).toEqual( + expectedPermission + ) }) }) From b91d518e544aed127d991eb9f289da6009ce8fec Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 17 Apr 2023 10:06:15 +0100 Subject: [PATCH 13/22] Remove zlib npm references --- packages/backend-core/package.json | 3 +- packages/server/package.json | 3 +- yarn.lock | 44 ++++++++++++++++++------------ 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 730acda357..e3cc680c20 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -54,8 +54,7 @@ "sanitize-s3-objectkey": "0.0.1", "semver": "7.3.7", "tar-fs": "2.1.1", - "uuid": "8.3.2", - "zlib": "1.0.5" + "uuid": "8.3.2" }, "devDependencies": { "@jest/test-sequencer": "29.5.0", diff --git a/packages/server/package.json b/packages/server/package.json index 65e79ba7b7..2f5261c9e9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -118,8 +118,7 @@ "vm2": "3.9.16", "worker-farm": "1.7.0", "xml2js": "0.5.0", - "yargs": "13.2.4", - "zlib": "1.0.5" + "yargs": "13.2.4" }, "devDependencies": { "@babel/core": "7.17.4", diff --git a/yarn.lock b/yarn.lock index c84f28b254..4817017747 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,14 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.4.tgz#9368117a41b276ec97d3994e3ec67d9f2570a5bc" - integrity sha512-xPNVlRFTcjpWn+oZCvrfgDd9SoslkUgJsS2Bnff+qDoWcTFz30KoOyZPAkSwXxX3Y8FmZRO9csl0AZa9TsUs7A== +"@budibase/pro@2.5.5-alpha.0": + version "2.5.5-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.0.tgz#28b075a96efb564328a4972cae9ea6c9a5f3aabc" + integrity sha512-98fLnvHWVy7ASEFC98bo6Qdd55SjC7yrJNuf7FUYZbeFwpmwwRxlWnWFTa0ctKWB5p2LToARWBns3TqgnUr/zQ== dependencies: - "@budibase/backend-core" "2.5.4" - "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.4" + "@budibase/backend-core" "2.5.5-alpha.0" + "@budibase/shared-core" "2.4.44-alpha.1" + "@budibase/string-templates" "2.4.44-alpha.1" + "@budibase/types" "2.5.5-alpha.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1501,6 +1502,15 @@ lru-cache "^7.14.1" memorystream "^0.3.1" node-fetch "^2.6.1" + scim-patch "^0.7.0" + scim2-parse-filter "^0.2.8" + +"@budibase/shared-core@2.4.44-alpha.1": + version "2.4.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.4.44-alpha.1.tgz#3d499e40e7e6c646e13a87cd08e01ba116c2ff1d" + integrity sha512-cN8LaDczijtsfWUYiXC4sg9Z+US4020i3Mb8TwCbf8TQyA1b06U5PwPCp+GHVA/wDFqfwcpcE1GXf8GwVuYs7A== + dependencies: + "@budibase/types" "2.4.44-alpha.1" "@budibase/standard-components@^0.9.139": version "0.9.139" @@ -1520,10 +1530,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@2.3.20": - version "2.3.20" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588" - integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg== +"@budibase/string-templates@2.4.44-alpha.1": + version "2.4.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.4.44-alpha.1.tgz#6c2aee594d16eac1f173c509e087a817dd3172f0" + integrity sha512-4gC2+0kccK0ilLnd0i/dmJzC0Ur7UgSAmV6zbzDDYNL4spU0qSy5VhBh7E3qKieg5RKMMzbpXLMWERpoPLlnqA== dependencies: "@budibase/handlebars-helpers" "^0.11.8" dayjs "^1.10.4" @@ -1532,6 +1542,11 @@ lodash "^4.17.20" vm2 "^3.9.4" +"@budibase/types@2.4.44-alpha.1": + version "2.4.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" + integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -21169,7 +21184,7 @@ scim-patch@^0.7.0: fast-deep-equal "3.1.3" scim2-parse-filter "0.2.8" -scim2-parse-filter@0.2.8: +scim2-parse-filter@0.2.8, scim2-parse-filter@^0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/scim2-parse-filter/-/scim2-parse-filter-0.2.8.tgz#12e836514b9a55ae51218dd6e7fbea91daccfa4d" integrity sha512-1V+6FIMIiP+gDiFkC3dIw86KfoXhnQRXhfPaiQImeeFukpLtEkTtYq/Vmy1yDgHQcIHQxQQqOWyGLKX0FTvvaA== @@ -24690,8 +24705,3 @@ z-schema@^5.0.1: validator "^13.7.0" optionalDependencies: commander "^10.0.0" - -zlib@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" - integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w== From ac4e45a4333e9847405dacf1064c0f4a85f7926f Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 17 Apr 2023 10:27:37 +0100 Subject: [PATCH 14/22] Replace usages --- packages/backend-core/src/objectStore/objectStore.ts | 6 +++--- packages/worker/src/api/index.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts index 059e1b228d..4ac3641de1 100644 --- a/packages/backend-core/src/objectStore/objectStore.ts +++ b/packages/backend-core/src/objectStore/objectStore.ts @@ -3,7 +3,7 @@ import AWS from "aws-sdk" import stream from "stream" import fetch from "node-fetch" import tar from "tar-fs" -const zlib = require("zlib") +import zlib from "zlib" import { promisify } from "util" import { join } from "path" import fs from "fs" @@ -415,7 +415,7 @@ export const downloadTarballDirect = async ( throw new Error(`unexpected response ${response.statusText}`) } - await streamPipeline(response.body, zlib.Unzip(), tar.extract(path)) + await streamPipeline(response.body, zlib.createUnzip(), tar.extract(path)) } export const downloadTarball = async ( @@ -431,7 +431,7 @@ export const downloadTarball = async ( } const tmpPath = join(budibaseTempDir(), path) - await streamPipeline(response.body, zlib.Unzip(), tar.extract(tmpPath)) + await streamPipeline(response.body, zlib.createUnzip(), tar.extract(tmpPath)) if (!env.isTest() && env.SELF_HOSTED) { await uploadDirectory(bucketName, tmpPath, path) } diff --git a/packages/worker/src/api/index.ts b/packages/worker/src/api/index.ts index b390d36bb8..2a3133af3f 100644 --- a/packages/worker/src/api/index.ts +++ b/packages/worker/src/api/index.ts @@ -1,6 +1,6 @@ import Router from "@koa/router" const compress = require("koa-compress") -const zlib = require("zlib") +import zlib from "zlib" import { routes } from "./routes" import { middleware as pro } from "@budibase/pro" import { auth, middleware } from "@budibase/backend-core" From 457e1d7a1a15cea100939f4686c4edfd932f44eb Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 09:34:23 +0000 Subject: [PATCH 15/22] v2.5.5-alpha.2 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index bdef39176a..147aa1933e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ed76f20b1f..dad0c7c332 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.5-alpha.1", + "@budibase/types": "2.5.5-alpha.2", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 8817de456e..2ca0f2b186 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.5-alpha.1", - "@budibase/string-templates": "2.5.5-alpha.1", + "@budibase/shared-core": "2.5.5-alpha.2", + "@budibase/string-templates": "2.5.5-alpha.2", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 6fc7ead6d1..f4ddfbff41 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.1", - "@budibase/client": "2.5.5-alpha.1", - "@budibase/frontend-core": "2.5.5-alpha.1", - "@budibase/shared-core": "2.5.5-alpha.1", - "@budibase/string-templates": "2.5.5-alpha.1", + "@budibase/bbui": "2.5.5-alpha.2", + "@budibase/client": "2.5.5-alpha.2", + "@budibase/frontend-core": "2.5.5-alpha.2", + "@budibase/shared-core": "2.5.5-alpha.2", + "@budibase/string-templates": "2.5.5-alpha.2", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 713dd0869d..f730552ec7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.1", - "@budibase/string-templates": "2.5.5-alpha.1", - "@budibase/types": "2.5.5-alpha.1", + "@budibase/backend-core": "2.5.5-alpha.2", + "@budibase/string-templates": "2.5.5-alpha.2", + "@budibase/types": "2.5.5-alpha.2", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 784b43fb99..d33737d8c6 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.1", - "@budibase/frontend-core": "2.5.5-alpha.1", - "@budibase/shared-core": "2.5.5-alpha.1", - "@budibase/string-templates": "2.5.5-alpha.1", - "@budibase/types": "2.5.5-alpha.1", + "@budibase/bbui": "2.5.5-alpha.2", + "@budibase/frontend-core": "2.5.5-alpha.2", + "@budibase/shared-core": "2.5.5-alpha.2", + "@budibase/string-templates": "2.5.5-alpha.2", + "@budibase/types": "2.5.5-alpha.2", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index a90f6d2fb9..49b926257f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.5-alpha.1", - "@budibase/shared-core": "2.5.5-alpha.1", + "@budibase/bbui": "2.5.5-alpha.2", + "@budibase/shared-core": "2.5.5-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 27468640ee..a4a5f0ecff 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index eae38f1a47..39fadc35c4 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.5-alpha.1", - "@budibase/client": "2.5.5-alpha.1", + "@budibase/backend-core": "2.5.5-alpha.2", + "@budibase/client": "2.5.5-alpha.2", "@budibase/pro": "2.5.5-alpha.1", - "@budibase/shared-core": "2.5.5-alpha.1", - "@budibase/string-templates": "2.5.5-alpha.1", - "@budibase/types": "2.5.5-alpha.1", + "@budibase/shared-core": "2.5.5-alpha.2", + "@budibase/string-templates": "2.5.5-alpha.2", + "@budibase/types": "2.5.5-alpha.2", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 23d61fa495..6864c3aa4f 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.5-alpha.1" + "@budibase/types": "2.5.5-alpha.2" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 5b9fc30247..b65c7b04b6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index fd6846aea0..1458b82a49 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index e9feddb86d..e99662638d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.1", + "@budibase/backend-core": "2.5.5-alpha.2", "@budibase/pro": "2.5.5-alpha.1", - "@budibase/string-templates": "2.5.5-alpha.1", - "@budibase/types": "2.5.5-alpha.1", + "@budibase/string-templates": "2.5.5-alpha.2", + "@budibase/types": "2.5.5-alpha.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From c1d85bc8b0d3ee7cc02fed5de592b6bf639a2697 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 09:35:44 +0000 Subject: [PATCH 16/22] Update pro version to 2.5.5-alpha.2 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 39fadc35c4..d2bc5c9f63 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.5-alpha.2", "@budibase/client": "2.5.5-alpha.2", - "@budibase/pro": "2.5.5-alpha.1", + "@budibase/pro": "2.5.5-alpha.2", "@budibase/shared-core": "2.5.5-alpha.2", "@budibase/string-templates": "2.5.5-alpha.2", "@budibase/types": "2.5.5-alpha.2", diff --git a/packages/worker/package.json b/packages/worker/package.json index e99662638d..48df14bf32 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.5-alpha.2", - "@budibase/pro": "2.5.5-alpha.1", + "@budibase/pro": "2.5.5-alpha.2", "@budibase/string-templates": "2.5.5-alpha.2", "@budibase/types": "2.5.5-alpha.2", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index c1b5be3b11..f5cd450ddc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.5-alpha.0": - version "2.5.5-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.0.tgz#28b075a96efb564328a4972cae9ea6c9a5f3aabc" - integrity sha512-98fLnvHWVy7ASEFC98bo6Qdd55SjC7yrJNuf7FUYZbeFwpmwwRxlWnWFTa0ctKWB5p2LToARWBns3TqgnUr/zQ== +"@budibase/pro@2.5.5-alpha.1": + version "2.5.5-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.1.tgz#6d9476ce724bd3e405cb2e0198c4b83b168e65bc" + integrity sha512-fEuropk/0aH1+lELX6wdFa8UUpE+SMtlvBbsgNR2ulvLgLLPEYhI2gINlhiItMWWgTtxNtele3hOs1VWhn0o2A== dependencies: - "@budibase/backend-core" "2.5.5-alpha.0" + "@budibase/backend-core" "2.5.5-alpha.1" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.5-alpha.0" + "@budibase/types" "2.5.5-alpha.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From f9c5fd489be3c3f43992cb040e2d2dce7934ca57 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 10:30:38 +0000 Subject: [PATCH 17/22] v2.5.5-alpha.3 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 147aa1933e..07a367b5a4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index dad0c7c332..9b0a8a5837 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.5-alpha.2", + "@budibase/types": "2.5.5-alpha.3", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 2ca0f2b186..da4feb0ae6 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.2", + "@budibase/shared-core": "2.5.5-alpha.3", + "@budibase/string-templates": "2.5.5-alpha.3", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index f4ddfbff41..4fdc0bb6fc 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.2", - "@budibase/client": "2.5.5-alpha.2", - "@budibase/frontend-core": "2.5.5-alpha.2", - "@budibase/shared-core": "2.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.2", + "@budibase/bbui": "2.5.5-alpha.3", + "@budibase/client": "2.5.5-alpha.3", + "@budibase/frontend-core": "2.5.5-alpha.3", + "@budibase/shared-core": "2.5.5-alpha.3", + "@budibase/string-templates": "2.5.5-alpha.3", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index f730552ec7..dc06537a7e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.2", - "@budibase/types": "2.5.5-alpha.2", + "@budibase/backend-core": "2.5.5-alpha.3", + "@budibase/string-templates": "2.5.5-alpha.3", + "@budibase/types": "2.5.5-alpha.3", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index d33737d8c6..9adf1ecf85 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.2", - "@budibase/frontend-core": "2.5.5-alpha.2", - "@budibase/shared-core": "2.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.2", - "@budibase/types": "2.5.5-alpha.2", + "@budibase/bbui": "2.5.5-alpha.3", + "@budibase/frontend-core": "2.5.5-alpha.3", + "@budibase/shared-core": "2.5.5-alpha.3", + "@budibase/string-templates": "2.5.5-alpha.3", + "@budibase/types": "2.5.5-alpha.3", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 49b926257f..e0997ee5df 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.5-alpha.2", - "@budibase/shared-core": "2.5.5-alpha.2", + "@budibase/bbui": "2.5.5-alpha.3", + "@budibase/shared-core": "2.5.5-alpha.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a4a5f0ecff..0275bce2f2 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index d2bc5c9f63..efdb01acca 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.5-alpha.2", - "@budibase/client": "2.5.5-alpha.2", + "@budibase/backend-core": "2.5.5-alpha.3", + "@budibase/client": "2.5.5-alpha.3", "@budibase/pro": "2.5.5-alpha.2", - "@budibase/shared-core": "2.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.2", - "@budibase/types": "2.5.5-alpha.2", + "@budibase/shared-core": "2.5.5-alpha.3", + "@budibase/string-templates": "2.5.5-alpha.3", + "@budibase/types": "2.5.5-alpha.3", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 6864c3aa4f..94c10ab576 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.5-alpha.2" + "@budibase/types": "2.5.5-alpha.3" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b65c7b04b6..fd892bcf61 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 1458b82a49..c1af111434 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 48df14bf32..dcbf0a8dcd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.2", + "@budibase/backend-core": "2.5.5-alpha.3", "@budibase/pro": "2.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.2", - "@budibase/types": "2.5.5-alpha.2", + "@budibase/string-templates": "2.5.5-alpha.3", + "@budibase/types": "2.5.5-alpha.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From b81be5d68618ba192c0b881dc4aed09082de26d3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 10:51:12 +0000 Subject: [PATCH 18/22] v2.5.5-alpha.4 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 07a367b5a4..8b98c283e6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 22640d6747..36896720b1 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.5-alpha.3", + "@budibase/types": "2.5.5-alpha.4", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index da4feb0ae6..8e841da001 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.5-alpha.3", - "@budibase/string-templates": "2.5.5-alpha.3", + "@budibase/shared-core": "2.5.5-alpha.4", + "@budibase/string-templates": "2.5.5-alpha.4", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 4fdc0bb6fc..8414d6493b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.3", - "@budibase/client": "2.5.5-alpha.3", - "@budibase/frontend-core": "2.5.5-alpha.3", - "@budibase/shared-core": "2.5.5-alpha.3", - "@budibase/string-templates": "2.5.5-alpha.3", + "@budibase/bbui": "2.5.5-alpha.4", + "@budibase/client": "2.5.5-alpha.4", + "@budibase/frontend-core": "2.5.5-alpha.4", + "@budibase/shared-core": "2.5.5-alpha.4", + "@budibase/string-templates": "2.5.5-alpha.4", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index dc06537a7e..4eca04e188 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.3", - "@budibase/string-templates": "2.5.5-alpha.3", - "@budibase/types": "2.5.5-alpha.3", + "@budibase/backend-core": "2.5.5-alpha.4", + "@budibase/string-templates": "2.5.5-alpha.4", + "@budibase/types": "2.5.5-alpha.4", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 9adf1ecf85..b18b87c40e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.3", - "@budibase/frontend-core": "2.5.5-alpha.3", - "@budibase/shared-core": "2.5.5-alpha.3", - "@budibase/string-templates": "2.5.5-alpha.3", - "@budibase/types": "2.5.5-alpha.3", + "@budibase/bbui": "2.5.5-alpha.4", + "@budibase/frontend-core": "2.5.5-alpha.4", + "@budibase/shared-core": "2.5.5-alpha.4", + "@budibase/string-templates": "2.5.5-alpha.4", + "@budibase/types": "2.5.5-alpha.4", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index e0997ee5df..92ecac8382 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.5-alpha.3", - "@budibase/shared-core": "2.5.5-alpha.3", + "@budibase/bbui": "2.5.5-alpha.4", + "@budibase/shared-core": "2.5.5-alpha.4", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0275bce2f2..1dfbcec5ba 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 3343515b09..917417510e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.5-alpha.3", - "@budibase/client": "2.5.5-alpha.3", + "@budibase/backend-core": "2.5.5-alpha.4", + "@budibase/client": "2.5.5-alpha.4", "@budibase/pro": "2.5.5-alpha.2", - "@budibase/shared-core": "2.5.5-alpha.3", - "@budibase/string-templates": "2.5.5-alpha.3", - "@budibase/types": "2.5.5-alpha.3", + "@budibase/shared-core": "2.5.5-alpha.4", + "@budibase/string-templates": "2.5.5-alpha.4", + "@budibase/types": "2.5.5-alpha.4", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 94c10ab576..24d3bb4063 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.5-alpha.3" + "@budibase/types": "2.5.5-alpha.4" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index fd892bcf61..21f27c1000 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index c1af111434..9e20d78dba 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index dcbf0a8dcd..5960dad005 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.3", + "@budibase/backend-core": "2.5.5-alpha.4", "@budibase/pro": "2.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.3", - "@budibase/types": "2.5.5-alpha.3", + "@budibase/string-templates": "2.5.5-alpha.4", + "@budibase/types": "2.5.5-alpha.4", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 3b0d854af0f6984a563a0974da13286bebd48080 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 10:52:36 +0000 Subject: [PATCH 19/22] Update pro version to 2.5.5-alpha.4 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 52 ++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 917417510e..9f148aedb1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.5-alpha.4", "@budibase/client": "2.5.5-alpha.4", - "@budibase/pro": "2.5.5-alpha.2", + "@budibase/pro": "2.5.5-alpha.4", "@budibase/shared-core": "2.5.5-alpha.4", "@budibase/string-templates": "2.5.5-alpha.4", "@budibase/types": "2.5.5-alpha.4", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5960dad005..4a763fc22b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.5-alpha.4", - "@budibase/pro": "2.5.5-alpha.2", + "@budibase/pro": "2.5.5-alpha.4", "@budibase/string-templates": "2.5.5-alpha.4", "@budibase/types": "2.5.5-alpha.4", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 0f58666fc1..1e849945fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,6 +1386,46 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/backend-core@2.5.5-alpha.2": + version "2.5.5-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5-alpha.2.tgz#592c56059e51b638db224f9380bc4f92e5ec7786" + integrity sha512-dXSDBr1VOw70+p202F2K1A1kv7l+H8I2xoAEPKIo7UPQa6erXo8/klv2EnyIpVRuUkQxx8X7wZwYCag59yIhPQ== + dependencies: + "@budibase/nano" "10.1.2" + "@budibase/pouchdb-replication-stream" "1.2.10" + "@budibase/types" "2.5.5-alpha.2" + "@shopify/jest-koa-mocks" "5.0.1" + "@techpass/passport-openidconnect" "0.3.2" + aws-cloudfront-sign "2.2.0" + aws-sdk "2.1030.0" + bcrypt "5.0.1" + bcryptjs "2.4.3" + bull "4.10.1" + correlation-id "4.0.0" + dotenv "16.0.1" + emitter-listener "1.1.2" + ioredis "4.28.0" + joi "17.6.0" + jsonwebtoken "9.0.0" + koa-passport "4.1.4" + koa-pino-logger "4.0.0" + lodash "4.17.21" + lodash.isarguments "3.1.0" + node-fetch "2.6.7" + passport-google-oauth "2.0.0" + passport-jwt "4.0.0" + passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" + posthog-node "1.3.0" + pouchdb "7.3.0" + pouchdb-find "7.2.2" + redlock "4.2.0" + sanitize-s3-objectkey "0.0.1" + semver "7.3.7" + tar-fs "2.1.1" + uuid "8.3.2" + zlib "1.0.5" + "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1547,6 +1587,13 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== +"@budibase/types@2.5.5-alpha.2": + version "2.5.5-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5-alpha.2.tgz#355c2a72c8134d6f486fe3dc1c727dc84481553e" + integrity sha512-HgcCiRS/pCCE+gD3qeRbk2vPkek6xb6L0zzlPIi3mFpzMgCF9PBpi7ZDVZ8XhSZ9mP2d+9N61o+tezOsDY6gYw== + dependencies: + scim-patch "^0.7.0" + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -24705,3 +24752,8 @@ z-schema@^5.0.1: validator "^13.7.0" optionalDependencies: commander "^10.0.0" + +zlib@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" + integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w== From 16b802b7f67879507fa98e3afc29707ef0ce18b3 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 17 Apr 2023 12:26:26 +0100 Subject: [PATCH 20/22] v2.5.6-alpha.0 --- lerna.json | 2 +- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lerna.json b/lerna.json index 8b98c283e6..4070070627 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.0", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/server/package.json b/packages/server/package.json index 9f148aedb1..62a3a1d749 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { diff --git a/packages/worker/package.json b/packages/worker/package.json index 4a763fc22b..02436b9ab1 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { From b62633587fb45fc026631743abb787c644ca8e59 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 11:33:21 +0000 Subject: [PATCH 21/22] v2.5.6-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 4070070627..5c8280fef2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.0", + "version": "2.5.6-alpha.1", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 36896720b1..77aac3b557 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.5-alpha.4", + "@budibase/types": "2.5.6-alpha.1", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 8e841da001..760772cffe 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.5-alpha.4", - "@budibase/string-templates": "2.5.5-alpha.4", + "@budibase/shared-core": "2.5.6-alpha.1", + "@budibase/string-templates": "2.5.6-alpha.1", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 8414d6493b..0fe2cfdeb3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.4", - "@budibase/client": "2.5.5-alpha.4", - "@budibase/frontend-core": "2.5.5-alpha.4", - "@budibase/shared-core": "2.5.5-alpha.4", - "@budibase/string-templates": "2.5.5-alpha.4", + "@budibase/bbui": "2.5.6-alpha.1", + "@budibase/client": "2.5.6-alpha.1", + "@budibase/frontend-core": "2.5.6-alpha.1", + "@budibase/shared-core": "2.5.6-alpha.1", + "@budibase/string-templates": "2.5.6-alpha.1", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 4eca04e188..49d8d2308a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.4", - "@budibase/string-templates": "2.5.5-alpha.4", - "@budibase/types": "2.5.5-alpha.4", + "@budibase/backend-core": "2.5.6-alpha.1", + "@budibase/string-templates": "2.5.6-alpha.1", + "@budibase/types": "2.5.6-alpha.1", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index b18b87c40e..de27e5da83 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.4", - "@budibase/frontend-core": "2.5.5-alpha.4", - "@budibase/shared-core": "2.5.5-alpha.4", - "@budibase/string-templates": "2.5.5-alpha.4", - "@budibase/types": "2.5.5-alpha.4", + "@budibase/bbui": "2.5.6-alpha.1", + "@budibase/frontend-core": "2.5.6-alpha.1", + "@budibase/shared-core": "2.5.6-alpha.1", + "@budibase/string-templates": "2.5.6-alpha.1", + "@budibase/types": "2.5.6-alpha.1", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 92ecac8382..c41c3adb28 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.5-alpha.4", - "@budibase/shared-core": "2.5.5-alpha.4", + "@budibase/bbui": "2.5.6-alpha.1", + "@budibase/shared-core": "2.5.6-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1dfbcec5ba..50c4ec597d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 62a3a1d749..8ccc41ced1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.0", + "version": "2.5.6-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.5-alpha.4", - "@budibase/client": "2.5.5-alpha.4", + "@budibase/backend-core": "2.5.6-alpha.1", + "@budibase/client": "2.5.6-alpha.1", "@budibase/pro": "2.5.5-alpha.4", - "@budibase/shared-core": "2.5.5-alpha.4", - "@budibase/string-templates": "2.5.5-alpha.4", - "@budibase/types": "2.5.5-alpha.4", + "@budibase/shared-core": "2.5.6-alpha.1", + "@budibase/string-templates": "2.5.6-alpha.1", + "@budibase/types": "2.5.6-alpha.1", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 24d3bb4063..9eb0c26ebc 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.5-alpha.4" + "@budibase/types": "2.5.6-alpha.1" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 21f27c1000..f4def12c14 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 9e20d78dba..e36d039375 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 02436b9ab1..67e5f656e7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.0", + "version": "2.5.6-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.4", + "@budibase/backend-core": "2.5.6-alpha.1", "@budibase/pro": "2.5.5-alpha.4", - "@budibase/string-templates": "2.5.5-alpha.4", - "@budibase/types": "2.5.5-alpha.4", + "@budibase/string-templates": "2.5.6-alpha.1", + "@budibase/types": "2.5.6-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From acab893fc0a429f3f52761fd8af898d3a8f9d426 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 11:34:41 +0000 Subject: [PATCH 22/22] Update pro version to 2.5.6-alpha.1 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 64 ++++-------------------------------- 3 files changed, 8 insertions(+), 60 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 8ccc41ced1..b78e0ad4e1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.1", "@budibase/client": "2.5.6-alpha.1", - "@budibase/pro": "2.5.5-alpha.4", + "@budibase/pro": "2.5.6-alpha.1", "@budibase/shared-core": "2.5.6-alpha.1", "@budibase/string-templates": "2.5.6-alpha.1", "@budibase/types": "2.5.6-alpha.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index 67e5f656e7..972437389b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.1", - "@budibase/pro": "2.5.5-alpha.4", + "@budibase/pro": "2.5.6-alpha.1", "@budibase/string-templates": "2.5.6-alpha.1", "@budibase/types": "2.5.6-alpha.1", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 1e849945fd..b68d5c4fed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,46 +1386,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.5-alpha.2": - version "2.5.5-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5-alpha.2.tgz#592c56059e51b638db224f9380bc4f92e5ec7786" - integrity sha512-dXSDBr1VOw70+p202F2K1A1kv7l+H8I2xoAEPKIo7UPQa6erXo8/klv2EnyIpVRuUkQxx8X7wZwYCag59yIhPQ== - dependencies: - "@budibase/nano" "10.1.2" - "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.5.5-alpha.2" - "@shopify/jest-koa-mocks" "5.0.1" - "@techpass/passport-openidconnect" "0.3.2" - aws-cloudfront-sign "2.2.0" - aws-sdk "2.1030.0" - bcrypt "5.0.1" - bcryptjs "2.4.3" - bull "4.10.1" - correlation-id "4.0.0" - dotenv "16.0.1" - emitter-listener "1.1.2" - ioredis "4.28.0" - joi "17.6.0" - jsonwebtoken "9.0.0" - koa-passport "4.1.4" - koa-pino-logger "4.0.0" - lodash "4.17.21" - lodash.isarguments "3.1.0" - node-fetch "2.6.7" - passport-google-oauth "2.0.0" - passport-jwt "4.0.0" - passport-local "1.0.0" - passport-oauth2-refresh "^2.1.0" - posthog-node "1.3.0" - pouchdb "7.3.0" - pouchdb-find "7.2.2" - redlock "4.2.0" - sanitize-s3-objectkey "0.0.1" - semver "7.3.7" - tar-fs "2.1.1" - uuid "8.3.2" - zlib "1.0.5" - "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1526,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.5-alpha.2": - version "2.5.5-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.2.tgz#dd3ec237997f1be5064ab931569c3621b7836b8b" - integrity sha512-pXB2BTA0/uXkZ3aCHjF06u/kxSx/mZ55T06nUAQR+64eXJ1D2BRKAqrkqjBnzXne9RGV/qEJtCu+xp8wNXII5A== +"@budibase/pro@2.5.5-alpha.4": + version "2.5.5-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.4.tgz#949a8c050300bbbd6d6729b1826c81d7dca1045d" + integrity sha512-7ndB99Mr74lXGbIw2g6NjCXszRsxgoS4Ean3RM7joXu90Gb+aSL/uxCDZbHzDbXlysOCN62CcIt3i4RdXE42eA== dependencies: - "@budibase/backend-core" "2.5.5-alpha.2" + "@budibase/backend-core" "2.5.5-alpha.4" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.5-alpha.2" + "@budibase/types" "2.5.5-alpha.4" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1587,13 +1547,6 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== -"@budibase/types@2.5.5-alpha.2": - version "2.5.5-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5-alpha.2.tgz#355c2a72c8134d6f486fe3dc1c727dc84481553e" - integrity sha512-HgcCiRS/pCCE+gD3qeRbk2vPkek6xb6L0zzlPIi3mFpzMgCF9PBpi7ZDVZ8XhSZ9mP2d+9N61o+tezOsDY6gYw== - dependencies: - scim-patch "^0.7.0" - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -24752,8 +24705,3 @@ z-schema@^5.0.1: validator "^13.7.0" optionalDependencies: commander "^10.0.0" - -zlib@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" - integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w==