From fd5743a9da5bb8fca7a31a4b6c0ebd4a0218eab9 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 1 Mar 2023 12:11:51 +0000 Subject: [PATCH 001/521] Fix to clear empty lastName string when accepting an invite to budibase --- packages/builder/src/stores/portal/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js index 1510207604..0f6636fbdc 100644 --- a/packages/builder/src/stores/portal/users.js +++ b/packages/builder/src/stores/portal/users.js @@ -34,7 +34,7 @@ export function createUsersStore() { inviteCode, password, firstName, - lastName, + lastName: !lastName?.trim() ? undefined : lastName, }) } From fe17abd7be9321e3d1ab05c865d816f0bde22bcf Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Thu, 6 Apr 2023 14:22:21 +0100 Subject: [PATCH 002/521] Add postgresSQL tests --- .../internal-api/api/BudibaseInternalAPI.ts | 3 + qa-core/src/internal-api/api/apis/AppAPI.ts | 1 + .../internal-api/api/apis/DatasourcesAPI.ts | 87 +++++++++++++++++++ .../src/internal-api/fixtures/datasources.ts | 37 ++++++++ qa-core/src/internal-api/fixtures/index.ts | 1 + .../tests/dataSources/postgresSQL.spec.ts | 60 +++++++++++++ qa-core/src/types/addedDatasource.ts | 5 ++ qa-core/src/types/index.ts | 1 + 8 files changed, 195 insertions(+) create mode 100644 qa-core/src/internal-api/api/apis/DatasourcesAPI.ts create mode 100644 qa-core/src/internal-api/fixtures/datasources.ts create mode 100644 qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts create mode 100644 qa-core/src/types/addedDatasource.ts diff --git a/qa-core/src/internal-api/api/BudibaseInternalAPI.ts b/qa-core/src/internal-api/api/BudibaseInternalAPI.ts index 5bb6b72ef0..4796799396 100644 --- a/qa-core/src/internal-api/api/BudibaseInternalAPI.ts +++ b/qa-core/src/internal-api/api/BudibaseInternalAPI.ts @@ -7,6 +7,7 @@ import ScreenAPI from "./apis/ScreenAPI" import SelfAPI from "./apis/SelfAPI" import TableAPI from "./apis/TableAPI" import UserAPI from "./apis/UserAPI" +import DatasourcesAPI from "./apis/DatasourcesAPI" import BudibaseInternalAPIClient from "./BudibaseInternalAPIClient" import { State } from "../../types" @@ -22,6 +23,7 @@ export default class BudibaseInternalAPI { self: SelfAPI tables: TableAPI users: UserAPI + datasources: DatasourcesAPI constructor(state: State) { this.client = new BudibaseInternalAPIClient(state) @@ -35,5 +37,6 @@ export default class BudibaseInternalAPI { this.self = new SelfAPI(this.client) this.tables = new TableAPI(this.client) this.users = new UserAPI(this.client) + this.datasources = new DatasourcesAPI(this.client) } } diff --git a/qa-core/src/internal-api/api/apis/AppAPI.ts b/qa-core/src/internal-api/api/apis/AppAPI.ts index 992728899e..bdbf5ba85d 100644 --- a/qa-core/src/internal-api/api/apis/AppAPI.ts +++ b/qa-core/src/internal-api/api/apis/AppAPI.ts @@ -60,6 +60,7 @@ export default class AppAPI { const [response, json] = await this.client.post(`/applications`, { body }) expect(response).toHaveStatusCode(200) expect(json._id).toBeDefined() + this.client.state.appId = json._id return json } diff --git a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts new file mode 100644 index 0000000000..15215b7ba4 --- /dev/null +++ b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts @@ -0,0 +1,87 @@ +import { Response } from "node-fetch" +import { Datasource } from "@budibase/types" +import { AddedDatasource } from "../../../types" +import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" + +export default class DatasourcesAPI { + client: BudibaseInternalAPIClient + + constructor(client: BudibaseInternalAPIClient) { + this.client = client + } + + async getIntegrations(): Promise<[Response, any]> { + const [response, json] = await this.client.get(`/integrations`) + expect(response).toHaveStatusCode(200) + const integrationsCount = Object.keys(json).length + expect(integrationsCount).toBe(16) + return [response, json] + } + + async getAll(): Promise<[Response, Datasource[]]> { + const [response, json] = await this.client.get(`/datasources`) + expect(response).toHaveStatusCode(200) + expect(json.length).toBeGreaterThan(0) + return [response, json] + } + + async getTable(dataSourceId: string): Promise<[Response, Datasource]> { + const [response, json] = await this.client.get( + `/datasources/${dataSourceId}` + ) + expect(response).toHaveStatusCode(200) + expect(json._id).toEqual(dataSourceId) + return [response, json] + } + + async add(body: any): Promise<[Response, AddedDatasource]> { + //temporarily using a hard coded datasource to test 500 error + const [response, json] = await this.client.post(`/datasources`, { body }) + expect(response).toHaveStatusCode(200) + expect(json.datasource._id).toBeDefined() + expect(json.datasource._rev).toBeDefined() + + return [response, json] + } + + async update(body: any): Promise<[Response, AddedDatasource]> { + const [response, json] = await this.client.put(`/datasources/${body._id}`, { + body, + }) + expect(response).toHaveStatusCode(200) + expect(json.datasource._id).toBeDefined() + expect(json.datasource._rev).toBeDefined() + + return [response, json] + } + + async previewQuery(body: any): Promise<[Response, any]> { + const [response, json] = await this.client.post(`/queries/preview`, { + body, + }) + expect(response).toHaveStatusCode(200) + return [response, json] + } + + async saveQuery(body: any): Promise<[Response, any]> { + const [response, json] = await this.client.post(`/queries`, { + body, + }) + expect(response).toHaveStatusCode(200) + return [response, json] + } + + async getQuery(queryId: string): Promise<[Response, any]> { + const [response, json] = await this.client.get(`/queries/${queryId}`) + expect(response).toHaveStatusCode(200) + return [response, json] + } + + async delete(dataSourceId: string, revId: string): Promise { + const [response, json] = await this.client.del( + `/datasources/${dataSourceId}/${revId}` + ) + expect(response).toHaveStatusCode(200) + return response + } +} diff --git a/qa-core/src/internal-api/fixtures/datasources.ts b/qa-core/src/internal-api/fixtures/datasources.ts new file mode 100644 index 0000000000..feb51add32 --- /dev/null +++ b/qa-core/src/internal-api/fixtures/datasources.ts @@ -0,0 +1,37 @@ +// Add information about the data source to the fixtures file from 1password + +export const mongoDB = () => { + return { + datasource: { + name: "MongoDB", + source: "MONGODB", + type: "datasource", + config: { + connectionString: "", + db: "", + }, + }, + + fetchSchema: false, + } +} + +export const postgresSQL = () => { + return { + datasource: { + name: "PostgresSQL", + plus: true, + source: "POSTGRES", + type: "datasource", + config: { + database: "", + host: "", + password: "", + port: 1111, + schema: "public", + user: "", + }, + }, + fetchSchema: true, + } +} diff --git a/qa-core/src/internal-api/fixtures/index.ts b/qa-core/src/internal-api/fixtures/index.ts index d97c5f76b7..880ff8d3d9 100644 --- a/qa-core/src/internal-api/fixtures/index.ts +++ b/qa-core/src/internal-api/fixtures/index.ts @@ -4,3 +4,4 @@ export * as rows from "./rows" export * as screens from "./screens" export * as tables from "./tables" export * as users from "./users" +export * as datasources from "./datasources" diff --git a/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts new file mode 100644 index 0000000000..b244cbde4b --- /dev/null +++ b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts @@ -0,0 +1,60 @@ +import TestConfiguration from "../../config/TestConfiguration" +import * as fixtures from "../../fixtures" + +describe("Internal API - Data Sources: PostgresSQL", () => { + const config = new TestConfiguration() + + beforeAll(async () => { + await config.beforeAll() + }) + + afterAll(async () => { + await config.afterAll() + }) + + it("Create an app with a data source - PostgresSQL", async () => { + // Create app + const app = await config.api.apps.create({ + ...fixtures.apps.generateApp(), + useTemplate: "false", + }) + + // Add data source + const [dataSourceResponse, dataSourceJson] = + await config.api.datasources.add(fixtures.datasources.postgresSQL()) + const newDataSourceInfo = { + ...dataSourceJson.datasource, + name: "PostgresSQL2", + } + const [updatedDataSourceResponse, updatedDataSourceJson] = + await config.api.datasources.update(newDataSourceInfo) + + const dataSourceQuery = { + datasourceId: updatedDataSourceJson.datasource._id, + fields: { + sql: "SELECT * FROM categories;", + }, + name: "Query 1", + parameters: {}, + queryVerb: "read", + schema: {}, + transformer: "return data", + } + // Query data source + + const [queryResponse, queryJson] = + await config.api.datasources.previewQuery(dataSourceQuery) + + // Save query + const [saveQueryResponse, saveQueryJson] = + await config.api.datasources.saveQuery(dataSourceQuery) + // Get Query + const [getQueryResponse, getQueryJson] = + await config.api.datasources.getQuery(saveQueryJson._id) + // Delete data source + const deleteResponse = await config.api.datasources.delete( + updatedDataSourceJson.datasource._id, + updatedDataSourceJson.datasource._rev + ) + }) +}) diff --git a/qa-core/src/types/addedDatasource.ts b/qa-core/src/types/addedDatasource.ts new file mode 100644 index 0000000000..65f51fd1bd --- /dev/null +++ b/qa-core/src/types/addedDatasource.ts @@ -0,0 +1,5 @@ +import { Datasource } from "@budibase/types" + +export interface AddedDatasource { + datasource: Datasource +} diff --git a/qa-core/src/types/index.ts b/qa-core/src/types/index.ts index bc75da46f8..6c3740200c 100644 --- a/qa-core/src/types/index.ts +++ b/qa-core/src/types/index.ts @@ -8,6 +8,7 @@ export * from "./responseMessage" export * from "./routing" export * from "./state" export * from "./unpublishAppResponse" +export * from "./addedDatasource" // re-export public api types export * from "@budibase/server/api/controllers/public/mapping/types" From 0562cf511c28968e0b994702193c2b76c3d0539d Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Tue, 11 Apr 2023 15:44:00 +0100 Subject: [PATCH 003/521] Add tests for datasources --- qa-core/src/internal-api/api/apis/AppAPI.ts | 1 - .../internal-api/api/apis/DatasourcesAPI.ts | 7 +- .../src/internal-api/fixtures/datasources.ts | 36 +++++++-- .../tests/dataSources/example.spec.ts | 27 ------- .../tests/dataSources/mariaDB.spec.ts | 71 ++++++++++++++++++ .../tests/dataSources/mongoDB.spec.ts | 75 +++++++++++++++++++ .../tests/dataSources/postgresSQL.spec.ts | 21 ++++-- 7 files changed, 196 insertions(+), 42 deletions(-) delete mode 100644 qa-core/src/internal-api/tests/dataSources/example.spec.ts create mode 100644 qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts create mode 100644 qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts diff --git a/qa-core/src/internal-api/api/apis/AppAPI.ts b/qa-core/src/internal-api/api/apis/AppAPI.ts index bdbf5ba85d..992728899e 100644 --- a/qa-core/src/internal-api/api/apis/AppAPI.ts +++ b/qa-core/src/internal-api/api/apis/AppAPI.ts @@ -60,7 +60,6 @@ export default class AppAPI { const [response, json] = await this.client.post(`/applications`, { body }) expect(response).toHaveStatusCode(200) expect(json._id).toBeDefined() - this.client.state.appId = json._id return json } diff --git a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts index 15215b7ba4..f61692b02f 100644 --- a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts +++ b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts @@ -35,7 +35,6 @@ export default class DatasourcesAPI { } async add(body: any): Promise<[Response, AddedDatasource]> { - //temporarily using a hard coded datasource to test 500 error const [response, json] = await this.client.post(`/datasources`, { body }) expect(response).toHaveStatusCode(200) expect(json.datasource._id).toBeDefined() @@ -77,6 +76,12 @@ export default class DatasourcesAPI { return [response, json] } + async getQueryPermissions(queryId: string): Promise<[Response, any]> { + const [response, json] = await this.client.get(`/permissions/${queryId}`) + expect(response).toHaveStatusCode(200) + return [response, json] + } + async delete(dataSourceId: string, revId: string): Promise { const [response, json] = await this.client.del( `/datasources/${dataSourceId}/${revId}` diff --git a/qa-core/src/internal-api/fixtures/datasources.ts b/qa-core/src/internal-api/fixtures/datasources.ts index feb51add32..a8d59b88a1 100644 --- a/qa-core/src/internal-api/fixtures/datasources.ts +++ b/qa-core/src/internal-api/fixtures/datasources.ts @@ -1,5 +1,4 @@ // Add information about the data source to the fixtures file from 1password - export const mongoDB = () => { return { datasource: { @@ -7,8 +6,8 @@ export const mongoDB = () => { source: "MONGODB", type: "datasource", config: { - connectionString: "", - db: "", + connectionString: process.env.MONGODB_CONNECTION_STRING, + db: process.env.MONGODB_DB, }, }, @@ -24,12 +23,33 @@ export const postgresSQL = () => { source: "POSTGRES", type: "datasource", config: { - database: "", - host: "", - password: "", - port: 1111, + database: process.env.POSTGRES_DB, + host: process.env.POSTGRES_HOST, + password: process.env.POSTGRES_PASSWORD, + port: process.env.POSTGRES_PORT, schema: "public", - user: "", + user: process.env.POSTGRES_USER, + }, + }, + fetchSchema: true, + } +} + +// Add the data source for MariaDB to the this file in the same style as above +export const mariaDB = () => { + return { + datasource: { + name: "MariaDB", + plus: true, + source: "MYSQL", + type: "datasource", + config: { + database: process.env.MARIADB_DB, + host: process.env.MARIADB_HOST, + password: process.env.MARIADB_PASSWORD, + port: process.env.MARIADB_PORT, + schema: "public", + user: process.env.MARIADB_USER, }, }, fetchSchema: true, diff --git a/qa-core/src/internal-api/tests/dataSources/example.spec.ts b/qa-core/src/internal-api/tests/dataSources/example.spec.ts deleted file mode 100644 index 0b8bc38a45..0000000000 --- a/qa-core/src/internal-api/tests/dataSources/example.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import TestConfiguration from "../../config/TestConfiguration" -import * as fixtures from "../../fixtures" - -describe("Internal API - Data Sources", () => { - const config = new TestConfiguration() - - beforeAll(async () => { - await config.beforeAll() - }) - - afterAll(async () => { - await config.afterAll() - }) - - it("Create an app with a data source", async () => { - // Create app - await config.createApp() - - // Create Screen - const roleArray = ["BASIC", "POWER", "ADMIN", "PUBLIC"] - for (let role in roleArray) { - const [response, screen] = await config.api.screens.create( - fixtures.screens.generateScreen(roleArray[role]) - ) - } - }) -}) diff --git a/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts b/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts new file mode 100644 index 0000000000..4ff9a7cd0a --- /dev/null +++ b/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts @@ -0,0 +1,71 @@ +import TestConfiguration from "../../config/TestConfiguration" +import * as fixtures from "../../fixtures" + +describe("Internal API - Data Sources: MariaDB", () => { + const config = new TestConfiguration() + + beforeAll(async () => { + await config.beforeAll() + }) + + afterAll(async () => { + await config.afterAll() + }) + + it("Create an app with a data source - MariaDB", async () => { + // Create app + await config.createApp() + + // Add data source + const [dataSourceResponse, dataSourceJson] = + await config.api.datasources.add(fixtures.datasources.mariaDB()) + + // Update data source + const newDataSourceInfo = { + ...dataSourceJson.datasource, + name: "MariaDB2", + } + const [updatedDataSourceResponse, updatedDataSourceJson] = + await config.api.datasources.update(newDataSourceInfo) + + const dataSourceQuery = { + datasourceId: updatedDataSourceJson.datasource._id, + fields: { + sql: "SELECT * FROM employees;", + }, + name: "Query 1", + parameters: {}, + queryVerb: "read", + schema: {}, + transformer: "return data", + } + // Query data source + + const [queryResponse, queryJson] = + await config.api.datasources.previewQuery(dataSourceQuery) + + // Save query + const datasourcetoSave = { + ...dataSourceQuery, + parameters: [], + } + + const [saveQueryResponse, saveQueryJson] = + await config.api.datasources.saveQuery(datasourcetoSave) + // Get Query + const [getQueryResponse, getQueryJson] = + await config.api.datasources.getQuery(saveQueryJson._id) + + // Get Query permissions + const [getQueryPermissionsResponse, getQueryPermissionsJson] = + await config.api.datasources.getQueryPermissions( + saveQueryJson._id + ) + + // Delete data source + const deleteResponse = await config.api.datasources.delete( + updatedDataSourceJson.datasource._id, + updatedDataSourceJson.datasource._rev + ) + }) +}) diff --git a/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts b/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts new file mode 100644 index 0000000000..6c57467930 --- /dev/null +++ b/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts @@ -0,0 +1,75 @@ +import TestConfiguration from "../../config/TestConfiguration" +import * as fixtures from "../../fixtures" + +describe("Internal API - Data Sources: MongoDB", () => { + const config = new TestConfiguration() + + beforeAll(async () => { + await config.beforeAll() + }) + + afterAll(async () => { + await config.afterAll() + }) + + it("Create an app with a data source - MongoDB", async () => { + // Create app + await config.createApp() + + // Add data source + const [dataSourceResponse, dataSourceJson] = + await config.api.datasources.add(fixtures.datasources.mongoDB()) + + // Update data source + const newDataSourceInfo = { + ...dataSourceJson.datasource, + name: "MongoDB2", + } + const [updatedDataSourceResponse, updatedDataSourceJson] = + await config.api.datasources.update(newDataSourceInfo) + + const dataSourceQuery = { + datasourceId: updatedDataSourceJson.datasource._id, + fields: { + extra: { + collection: "movies", + actionType: "find", + }, + json: "", + }, + name: "Test Query", + parameters: {}, + queryVerb: "read", + schema: {}, + transformer: "return data", + } + // Query data source + + const [queryResponse, queryJson] = + await config.api.datasources.previewQuery(dataSourceQuery) + + // Save query + const datasourcetoSave = { + ...dataSourceQuery, + parameters: [], + } + + const [saveQueryResponse, saveQueryJson] = + await config.api.datasources.saveQuery(datasourcetoSave) + // Get Query + const [getQueryResponse, getQueryJson] = + await config.api.datasources.getQuery(saveQueryJson._id) + + // Get Query permissions + const [getQueryPermissionsResponse, getQueryPermissionsJson] = + await config.api.datasources.getQueryPermissions( + saveQueryJson._id + ) + + // Delete data source + const deleteResponse = await config.api.datasources.delete( + updatedDataSourceJson.datasource._id, + updatedDataSourceJson.datasource._rev + ) + }) +}) diff --git a/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts index b244cbde4b..83d1fc782d 100644 --- a/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts @@ -14,14 +14,13 @@ describe("Internal API - Data Sources: PostgresSQL", () => { it("Create an app with a data source - PostgresSQL", async () => { // Create app - const app = await config.api.apps.create({ - ...fixtures.apps.generateApp(), - useTemplate: "false", - }) + await config.createApp() // Add data source const [dataSourceResponse, dataSourceJson] = await config.api.datasources.add(fixtures.datasources.postgresSQL()) + + // Update data source const newDataSourceInfo = { ...dataSourceJson.datasource, name: "PostgresSQL2", @@ -46,11 +45,23 @@ describe("Internal API - Data Sources: PostgresSQL", () => { await config.api.datasources.previewQuery(dataSourceQuery) // Save query + const datasourcetoSave = { + ...dataSourceQuery, + parameters: [], + } + const [saveQueryResponse, saveQueryJson] = - await config.api.datasources.saveQuery(dataSourceQuery) + await config.api.datasources.saveQuery(datasourcetoSave) // Get Query const [getQueryResponse, getQueryJson] = await config.api.datasources.getQuery(saveQueryJson._id) + + // Get Query permissions + const [getQueryPermissionsResponse, getQueryPermissionsJson] = + await config.api.datasources.getQueryPermissions( + saveQueryJson._id + ) + // Delete data source const deleteResponse = await config.api.datasources.delete( updatedDataSourceJson.datasource._id, From a8460169d12c4b8786186096198512b40a5f5161 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Wed, 12 Apr 2023 18:18:28 +0100 Subject: [PATCH 004/521] Improvements on types, helpers and assertions --- .../types/src/documents/app/datasource.ts | 8 ++ packages/types/src/documents/app/query.ts | 4 + qa-core/src/environment.ts | 14 ++++ .../internal-api/api/BudibaseInternalAPI.ts | 9 +++ .../internal-api/api/apis/DatasourcesAPI.ts | 11 ++- .../internal-api/api/apis/IntegrationsAPI.ts | 18 +++++ .../internal-api/api/apis/PermissionsAPI.ts | 16 ++++ .../src/internal-api/api/apis/QueriesAPI.ts | 33 ++++++++ qa-core/src/internal-api/fixtures/index.ts | 1 + qa-core/src/internal-api/fixtures/queries.ts | 75 +++++++++++++++++++ .../tests/dataSources/mariaDB.spec.ts | 46 ++++++------ .../tests/dataSources/mongoDB.spec.ts | 50 ++++++------- .../tests/dataSources/postgresSQL.spec.ts | 46 ++++++------ qa-core/src/types/addedDatasource.ts | 5 -- 14 files changed, 251 insertions(+), 85 deletions(-) create mode 100644 qa-core/src/internal-api/api/apis/IntegrationsAPI.ts create mode 100644 qa-core/src/internal-api/api/apis/PermissionsAPI.ts create mode 100644 qa-core/src/internal-api/api/apis/QueriesAPI.ts create mode 100644 qa-core/src/internal-api/fixtures/queries.ts delete mode 100644 qa-core/src/types/addedDatasource.ts diff --git a/packages/types/src/documents/app/datasource.ts b/packages/types/src/documents/app/datasource.ts index 8dfdfe6d0f..9b498fb4b3 100644 --- a/packages/types/src/documents/app/datasource.ts +++ b/packages/types/src/documents/app/datasource.ts @@ -56,3 +56,11 @@ export interface RestConfig { } ] } + +export interface CreateDatasourceResponse { + datasource: Datasource +} + +export interface UpdatedDatasourceResponse { + datasource: Datasource +} diff --git a/packages/types/src/documents/app/query.ts b/packages/types/src/documents/app/query.ts index 72b6c288a5..d0bbf05b5c 100644 --- a/packages/types/src/documents/app/query.ts +++ b/packages/types/src/documents/app/query.ts @@ -42,3 +42,7 @@ export interface PaginationValues { page: string | number | null limit: number | null } + +export interface PreviewQueryRequest extends Omit { + parameters: {} +} diff --git a/qa-core/src/environment.ts b/qa-core/src/environment.ts index 9377461a24..262f5505df 100644 --- a/qa-core/src/environment.ts +++ b/qa-core/src/environment.ts @@ -13,6 +13,20 @@ const env = { ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL, BB_ADMIN_USER_EMAIL: process.env.BB_ADMIN_USER_EMAIL, BB_ADMIN_USER_PASSWORD: process.env.BB_ADMIN_USER_PASSWORD, + POSTGRES_HOST: process.env.POSTGRES_HOST, + POSTGRES_PORT: process.env.POSTGRES_PORT, + POSTGRES_DB: process.env.POSTGRES_DB, + POSTGRES_USER: process.env.POSTGRES_USER, + POSTGRES_PASSWORD: process.env.POSTGRES_PASSWORD, + MONGODB_CONNECTION_STRING: process.env.MONGODB_CONNECTION_STRING, + MONGODB_DB: process.env.MONGODB_DB, + REST_API_BASE_URL: process.env.REST_API_BASE_URL, + REST_API_KEY: process.env.REST_API_KEY, + MARIADB_HOST: process.env.MARIADB_HOST, + MARIADB_PORT: process.env.MARIADB_PORT, + MARIADB_DB: process.env.MARIADB_DB, + MARIADB_USER: process.env.MARIADB_USER, + MARIADB_PASSWORD: process.env.MARIADB_PASSWORD, } export = env diff --git a/qa-core/src/internal-api/api/BudibaseInternalAPI.ts b/qa-core/src/internal-api/api/BudibaseInternalAPI.ts index 4796799396..316775b1b9 100644 --- a/qa-core/src/internal-api/api/BudibaseInternalAPI.ts +++ b/qa-core/src/internal-api/api/BudibaseInternalAPI.ts @@ -8,6 +8,9 @@ import SelfAPI from "./apis/SelfAPI" import TableAPI from "./apis/TableAPI" import UserAPI from "./apis/UserAPI" import DatasourcesAPI from "./apis/DatasourcesAPI" +import IntegrationsAPI from "./apis/IntegrationsAPI" +import QueriesAPI from "./apis/QueriesAPI" +import PermissionsAPI from "./apis/PermissionsAPI" import BudibaseInternalAPIClient from "./BudibaseInternalAPIClient" import { State } from "../../types" @@ -24,6 +27,9 @@ export default class BudibaseInternalAPI { tables: TableAPI users: UserAPI datasources: DatasourcesAPI + integrations: IntegrationsAPI + queries: QueriesAPI + permissions: PermissionsAPI constructor(state: State) { this.client = new BudibaseInternalAPIClient(state) @@ -38,5 +44,8 @@ export default class BudibaseInternalAPI { this.tables = new TableAPI(this.client) this.users = new UserAPI(this.client) this.datasources = new DatasourcesAPI(this.client) + this.integrations = new IntegrationsAPI(this.client) + this.queries = new QueriesAPI(this.client) + this.permissions = new PermissionsAPI(this.client) } } diff --git a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts index f61692b02f..7b9d7af789 100644 --- a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts +++ b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts @@ -1,6 +1,9 @@ import { Response } from "node-fetch" -import { Datasource } from "@budibase/types" -import { AddedDatasource } from "../../../types" +import { + Datasource, + CreateDatasourceResponse, + UpdatedDatasourceResponse, +} from "@budibase/types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" export default class DatasourcesAPI { @@ -34,7 +37,7 @@ export default class DatasourcesAPI { return [response, json] } - async add(body: any): Promise<[Response, AddedDatasource]> { + async add(body: any): Promise<[Response, CreateDatasourceResponse]> { const [response, json] = await this.client.post(`/datasources`, { body }) expect(response).toHaveStatusCode(200) expect(json.datasource._id).toBeDefined() @@ -43,7 +46,7 @@ export default class DatasourcesAPI { return [response, json] } - async update(body: any): Promise<[Response, AddedDatasource]> { + async update(body: any): Promise<[Response, UpdatedDatasourceResponse]> { const [response, json] = await this.client.put(`/datasources/${body._id}`, { body, }) diff --git a/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts b/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts new file mode 100644 index 0000000000..b42b999825 --- /dev/null +++ b/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts @@ -0,0 +1,18 @@ +import { Response } from "node-fetch" +import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" + +export default class IntegrationsAPI { + client: BudibaseInternalAPIClient + + constructor(client: BudibaseInternalAPIClient) { + this.client = client + } + + async getAll(): Promise<[Response, any]> { + const [response, json] = await this.client.get(`/integrations`) + expect(response).toHaveStatusCode(200) + const integrationsCount = Object.keys(json).length + expect(integrationsCount).toBe(16) + return [response, json] + } +} diff --git a/qa-core/src/internal-api/api/apis/PermissionsAPI.ts b/qa-core/src/internal-api/api/apis/PermissionsAPI.ts new file mode 100644 index 0000000000..e78ef7560d --- /dev/null +++ b/qa-core/src/internal-api/api/apis/PermissionsAPI.ts @@ -0,0 +1,16 @@ +import { Response } from "node-fetch" +import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" + +export default class PermissionsAPI { + client: BudibaseInternalAPIClient + + constructor(client: BudibaseInternalAPIClient) { + this.client = client + } + + async getAll(id: string): Promise<[Response, any]> { + const [response, json] = await this.client.get(`/permissions/${id}`) + expect(response).toHaveStatusCode(200) + return [response, json] + } +} diff --git a/qa-core/src/internal-api/api/apis/QueriesAPI.ts b/qa-core/src/internal-api/api/apis/QueriesAPI.ts new file mode 100644 index 0000000000..5c8ac9883e --- /dev/null +++ b/qa-core/src/internal-api/api/apis/QueriesAPI.ts @@ -0,0 +1,33 @@ +import { Response } from "node-fetch" +import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" +import { PreviewQueryRequest, Query } from "@budibase/types" + +export default class DatasourcesAPI { + client: BudibaseInternalAPIClient + + constructor(client: BudibaseInternalAPIClient) { + this.client = client + } + + async preview(body: PreviewQueryRequest): Promise<[Response, any]> { + const [response, json] = await this.client.post(`/queries/preview`, { + body, + }) + expect(response).toHaveStatusCode(200) + return [response, json] + } + + async save(body: Query): Promise<[Response, any]> { + const [response, json] = await this.client.post(`/queries`, { + body, + }) + expect(response).toHaveStatusCode(200) + return [response, json] + } + + async get(queryId: string): Promise<[Response, any]> { + const [response, json] = await this.client.get(`/queries/${queryId}`) + expect(response).toHaveStatusCode(200) + return [response, json] + } +} diff --git a/qa-core/src/internal-api/fixtures/index.ts b/qa-core/src/internal-api/fixtures/index.ts index 880ff8d3d9..38291052b8 100644 --- a/qa-core/src/internal-api/fixtures/index.ts +++ b/qa-core/src/internal-api/fixtures/index.ts @@ -5,3 +5,4 @@ export * as screens from "./screens" export * as tables from "./tables" export * as users from "./users" export * as datasources from "./datasources" +export * as queries from "./queries" diff --git a/qa-core/src/internal-api/fixtures/queries.ts b/qa-core/src/internal-api/fixtures/queries.ts new file mode 100644 index 0000000000..7ba81fc744 --- /dev/null +++ b/qa-core/src/internal-api/fixtures/queries.ts @@ -0,0 +1,75 @@ +import { PreviewQueryRequest } from "@budibase/types" + +const query = (datasourceId: string, fields: any): any => { + return { + datasourceId: datasourceId, + fields: fields, + name: "Query 1", + parameters: {}, + queryVerb: "read", + schema: {}, + transformer: "return data", + } +} + +export const mariaDB = (datasourceId: string): PreviewQueryRequest => { + const fields = { + sql: "SELECT * FROM employees LIMIT 10;", + } + return query(datasourceId, fields) +} + +export const mongoDB = (datasourceId: string): PreviewQueryRequest => { + const fields = { + extra: { + collection: "movies", + actionType: "find", + }, + json: "", + } + return query(datasourceId, fields) +} + +export const postgres = (datasourceId: string): PreviewQueryRequest => { + const fields = { + sql: "SELECT * FROM customers;", + } + return query(datasourceId, fields) +} + +export const expectedSchemaFields = { + mariaDB: { + birth_date: "string", + emp_no: "number", + first_name: "string", + gender: "string", + hire_date: "string", + last_name: "string", + }, + mongoDB: { + directors: "array", + genres: "array", + image: "string", + plot: "string", + rank: "number", + rating: "number", + release_date: "string", + running_time_secs: "number", + title: "string", + year: "number", + _id: "json", + }, + postgres: { + address: "string", + city: "string", + company_name: "string", + contact_name: "string", + contact_title: "string", + country: "string", + customer_id: "string", + fax: "string", + phone: "string", + postal_code: "string", + region: "string", + }, +} diff --git a/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts b/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts index 4ff9a7cd0a..44c2c03c8b 100644 --- a/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts @@ -1,5 +1,6 @@ import TestConfiguration from "../../config/TestConfiguration" import * as fixtures from "../../fixtures" +import { Query } from "@budibase/types" describe("Internal API - Data Sources: MariaDB", () => { const config = new TestConfiguration() @@ -16,6 +17,9 @@ describe("Internal API - Data Sources: MariaDB", () => { // Create app await config.createApp() + // Get all integrations + await config.api.integrations.getAll() + // Add data source const [dataSourceResponse, dataSourceJson] = await config.api.datasources.add(fixtures.datasources.mariaDB()) @@ -28,44 +32,38 @@ describe("Internal API - Data Sources: MariaDB", () => { const [updatedDataSourceResponse, updatedDataSourceJson] = await config.api.datasources.update(newDataSourceInfo) - const dataSourceQuery = { - datasourceId: updatedDataSourceJson.datasource._id, - fields: { - sql: "SELECT * FROM employees;", - }, - name: "Query 1", - parameters: {}, - queryVerb: "read", - schema: {}, - transformer: "return data", - } // Query data source + const [queryResponse, queryJson] = await config.api.queries.preview( + fixtures.queries.mariaDB(updatedDataSourceJson.datasource._id!) + ) - const [queryResponse, queryJson] = - await config.api.datasources.previewQuery(dataSourceQuery) + expect(queryJson.rows.length).toEqual(10) + expect(queryJson.schemaFields).toEqual( + fixtures.queries.expectedSchemaFields.mariaDB + ) // Save query - const datasourcetoSave = { - ...dataSourceQuery, + const datasourcetoSave: Query = { + ...fixtures.queries.mariaDB(updatedDataSourceJson.datasource._id!), parameters: [], } - const [saveQueryResponse, saveQueryJson] = - await config.api.datasources.saveQuery(datasourcetoSave) + const [saveQueryResponse, saveQueryJson] = await config.api.queries.save( + datasourcetoSave + ) // Get Query - const [getQueryResponse, getQueryJson] = - await config.api.datasources.getQuery(saveQueryJson._id) + const [getQueryResponse, getQueryJson] = await config.api.queries.get( + saveQueryJson._id + ) // Get Query permissions const [getQueryPermissionsResponse, getQueryPermissionsJson] = - await config.api.datasources.getQueryPermissions( - saveQueryJson._id - ) + await config.api.permissions.getAll(saveQueryJson._id!) // Delete data source const deleteResponse = await config.api.datasources.delete( - updatedDataSourceJson.datasource._id, - updatedDataSourceJson.datasource._rev + updatedDataSourceJson.datasource._id!, + updatedDataSourceJson.datasource._rev! ) }) }) diff --git a/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts b/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts index 6c57467930..ed5178b57c 100644 --- a/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts @@ -1,5 +1,6 @@ import TestConfiguration from "../../config/TestConfiguration" import * as fixtures from "../../fixtures" +import { Query } from "@budibase/types" describe("Internal API - Data Sources: MongoDB", () => { const config = new TestConfiguration() @@ -16,6 +17,9 @@ describe("Internal API - Data Sources: MongoDB", () => { // Create app await config.createApp() + // Get all integrations + await config.api.integrations.getAll() + // Add data source const [dataSourceResponse, dataSourceJson] = await config.api.datasources.add(fixtures.datasources.mongoDB()) @@ -28,48 +32,38 @@ describe("Internal API - Data Sources: MongoDB", () => { const [updatedDataSourceResponse, updatedDataSourceJson] = await config.api.datasources.update(newDataSourceInfo) - const dataSourceQuery = { - datasourceId: updatedDataSourceJson.datasource._id, - fields: { - extra: { - collection: "movies", - actionType: "find", - }, - json: "", - }, - name: "Test Query", - parameters: {}, - queryVerb: "read", - schema: {}, - transformer: "return data", - } // Query data source + const [queryResponse, queryJson] = await config.api.queries.preview( + fixtures.queries.mongoDB(updatedDataSourceJson.datasource._id!) + ) - const [queryResponse, queryJson] = - await config.api.datasources.previewQuery(dataSourceQuery) + expect(queryJson.rows.length).toBeGreaterThan(10) + expect(queryJson.schemaFields).toEqual( + fixtures.queries.expectedSchemaFields.mongoDB + ) // Save query - const datasourcetoSave = { - ...dataSourceQuery, + const datasourcetoSave: Query = { + ...fixtures.queries.mongoDB(updatedDataSourceJson.datasource._id!), parameters: [], } - const [saveQueryResponse, saveQueryJson] = - await config.api.datasources.saveQuery(datasourcetoSave) + const [saveQueryResponse, saveQueryJson] = await config.api.queries.save( + datasourcetoSave + ) // Get Query - const [getQueryResponse, getQueryJson] = - await config.api.datasources.getQuery(saveQueryJson._id) + const [getQueryResponse, getQueryJson] = await config.api.queries.get( + saveQueryJson._id + ) // Get Query permissions const [getQueryPermissionsResponse, getQueryPermissionsJson] = - await config.api.datasources.getQueryPermissions( - saveQueryJson._id - ) + await config.api.permissions.getAll(saveQueryJson._id!) // Delete data source const deleteResponse = await config.api.datasources.delete( - updatedDataSourceJson.datasource._id, - updatedDataSourceJson.datasource._rev + updatedDataSourceJson.datasource._id!, + updatedDataSourceJson.datasource._rev! ) }) }) diff --git a/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts index 83d1fc782d..bc8d86b862 100644 --- a/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts @@ -1,5 +1,6 @@ import TestConfiguration from "../../config/TestConfiguration" import * as fixtures from "../../fixtures" +import { Query } from "@budibase/types" describe("Internal API - Data Sources: PostgresSQL", () => { const config = new TestConfiguration() @@ -16,6 +17,9 @@ describe("Internal API - Data Sources: PostgresSQL", () => { // Create app await config.createApp() + // Get all integrations + await config.api.integrations.getAll() + // Add data source const [dataSourceResponse, dataSourceJson] = await config.api.datasources.add(fixtures.datasources.postgresSQL()) @@ -28,44 +32,38 @@ describe("Internal API - Data Sources: PostgresSQL", () => { const [updatedDataSourceResponse, updatedDataSourceJson] = await config.api.datasources.update(newDataSourceInfo) - const dataSourceQuery = { - datasourceId: updatedDataSourceJson.datasource._id, - fields: { - sql: "SELECT * FROM categories;", - }, - name: "Query 1", - parameters: {}, - queryVerb: "read", - schema: {}, - transformer: "return data", - } // Query data source + const [queryResponse, queryJson] = await config.api.queries.preview( + fixtures.queries.postgres(updatedDataSourceJson.datasource._id!) + ) - const [queryResponse, queryJson] = - await config.api.datasources.previewQuery(dataSourceQuery) + expect(queryJson.rows.length).toEqual(91) + expect(queryJson.schemaFields).toEqual( + fixtures.queries.expectedSchemaFields.postgres + ) // Save query - const datasourcetoSave = { - ...dataSourceQuery, + const datasourcetoSave: Query = { + ...fixtures.queries.postgres(updatedDataSourceJson.datasource._id!), parameters: [], } - const [saveQueryResponse, saveQueryJson] = - await config.api.datasources.saveQuery(datasourcetoSave) + const [saveQueryResponse, saveQueryJson] = await config.api.queries.save( + datasourcetoSave + ) // Get Query - const [getQueryResponse, getQueryJson] = - await config.api.datasources.getQuery(saveQueryJson._id) + const [getQueryResponse, getQueryJson] = await config.api.queries.get( + saveQueryJson._id! + ) // Get Query permissions const [getQueryPermissionsResponse, getQueryPermissionsJson] = - await config.api.datasources.getQueryPermissions( - saveQueryJson._id - ) + await config.api.permissions.getAll(saveQueryJson._id!) // Delete data source const deleteResponse = await config.api.datasources.delete( - updatedDataSourceJson.datasource._id, - updatedDataSourceJson.datasource._rev + updatedDataSourceJson.datasource._id!, + updatedDataSourceJson.datasource._rev! ) }) }) diff --git a/qa-core/src/types/addedDatasource.ts b/qa-core/src/types/addedDatasource.ts deleted file mode 100644 index 65f51fd1bd..0000000000 --- a/qa-core/src/types/addedDatasource.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { Datasource } from "@budibase/types" - -export interface AddedDatasource { - datasource: Datasource -} From 695f77fd1d7b0fcab0816eb47cc37e46462b0be3 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Thu, 13 Apr 2023 11:13:21 +0100 Subject: [PATCH 005/521] Add types for datasources endpoints --- .../server/src/api/controllers/datasource.ts | 20 ++++++++++++++----- packages/types/src/api/web/app/datasource.ts | 19 ++++++++++++++++++ packages/types/src/api/web/app/index.ts | 1 + 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 packages/types/src/api/web/app/datasource.ts diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 3d41cd89af..b61b168980 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -12,7 +12,15 @@ import { getIntegration } from "../../integrations" import { getDatasourceAndQuery } from "./row/utils" import { invalidateDynamicVariables } from "../../threads/utils" import { db as dbCore, context, events } from "@budibase/backend-core" -import { UserCtx, Datasource, Row } from "@budibase/types" +import { + UserCtx, + Datasource, + Row, + CreateDatasourceResponse, + UpdateDatasourceResponse, + UpdateDatasourceRequest, + CreateDatasourceRequest, +} from "@budibase/types" import sdk from "../../sdk" export async function fetch(ctx: UserCtx) { @@ -146,7 +154,7 @@ async function invalidateVariables( await invalidateDynamicVariables(toInvalidate) } -export async function update(ctx: UserCtx) { +export async function update(ctx: UserCtx) { const db = context.getAppDB() const datasourceId = ctx.params.datasourceId let datasource = await sdk.datasources.get(datasourceId) @@ -187,15 +195,17 @@ export async function update(ctx: UserCtx) { } } -export async function save(ctx: UserCtx) { +export async function save( + ctx: UserCtx +) { const db = context.getAppDB() const plus = ctx.request.body.datasource.plus const fetchSchema = ctx.request.body.fetchSchema const datasource = { _id: generateDatasourceID({ plus }), - type: plus ? DocumentType.DATASOURCE_PLUS : DocumentType.DATASOURCE, ...ctx.request.body.datasource, + type: plus ? DocumentType.DATASOURCE_PLUS : DocumentType.DATASOURCE, } let schemaError = null @@ -218,7 +228,7 @@ export async function save(ctx: UserCtx) { } } - const response: any = { + const response: CreateDatasourceResponse = { datasource: await sdk.datasources.removeSecretSingle(datasource), } if (schemaError) { diff --git a/packages/types/src/api/web/app/datasource.ts b/packages/types/src/api/web/app/datasource.ts new file mode 100644 index 0000000000..d54259eab5 --- /dev/null +++ b/packages/types/src/api/web/app/datasource.ts @@ -0,0 +1,19 @@ +import { Datasource } from "../../../documents" + +export interface CreateDatasourceResponse { + datasource: Datasource + error?: any +} + +export interface UpdateDatasourceResponse { + datasource: Datasource +} + +export interface CreateDatasourceRequest { + datasource: Datasource + fetchSchema?: boolean +} + +export interface UpdateDatasourceRequest extends Datasource { + datasource: Datasource +} diff --git a/packages/types/src/api/web/app/index.ts b/packages/types/src/api/web/app/index.ts index 1d73755cb6..9be15ecfe3 100644 --- a/packages/types/src/api/web/app/index.ts +++ b/packages/types/src/api/web/app/index.ts @@ -1 +1,2 @@ export * from "./backup" +export * from "./datasource" From e20838fd428d3b2a887531050b8a922a261336dc Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Fri, 14 Apr 2023 17:35:13 +0100 Subject: [PATCH 006/521] Add rest test and fix type --- .../types/src/documents/app/datasource.ts | 8 --- packages/types/src/documents/app/query.ts | 3 + .../src/internal-api/fixtures/datasources.ts | 18 ++++- qa-core/src/internal-api/fixtures/queries.ts | 48 +++++++++++++ .../tests/dataSources/restAPI.spec.ts | 69 +++++++++++++++++++ 5 files changed, 136 insertions(+), 10 deletions(-) create mode 100644 qa-core/src/internal-api/tests/dataSources/restAPI.spec.ts diff --git a/packages/types/src/documents/app/datasource.ts b/packages/types/src/documents/app/datasource.ts index 9b498fb4b3..8dfdfe6d0f 100644 --- a/packages/types/src/documents/app/datasource.ts +++ b/packages/types/src/documents/app/datasource.ts @@ -56,11 +56,3 @@ export interface RestConfig { } ] } - -export interface CreateDatasourceResponse { - datasource: Datasource -} - -export interface UpdatedDatasourceResponse { - datasource: Datasource -} diff --git a/packages/types/src/documents/app/query.ts b/packages/types/src/documents/app/query.ts index d0bbf05b5c..31a3a3ba09 100644 --- a/packages/types/src/documents/app/query.ts +++ b/packages/types/src/documents/app/query.ts @@ -45,4 +45,7 @@ export interface PaginationValues { export interface PreviewQueryRequest extends Omit { parameters: {} + flags?: { + urlName?: boolean + } } diff --git a/qa-core/src/internal-api/fixtures/datasources.ts b/qa-core/src/internal-api/fixtures/datasources.ts index a8d59b88a1..dcf6af824a 100644 --- a/qa-core/src/internal-api/fixtures/datasources.ts +++ b/qa-core/src/internal-api/fixtures/datasources.ts @@ -34,8 +34,6 @@ export const postgresSQL = () => { fetchSchema: true, } } - -// Add the data source for MariaDB to the this file in the same style as above export const mariaDB = () => { return { datasource: { @@ -55,3 +53,19 @@ export const mariaDB = () => { fetchSchema: true, } } + +export const restAPI = () => { + return { + datasource: { + name: "RestAPI", + source: "REST", + type: "datasource", + config: { + defaultHeaders: {}, + rejectUnauthorized: true, + url: process.env.REST_API_BASE_URL, + }, + }, + fetchSchema: false, + } +} diff --git a/qa-core/src/internal-api/fixtures/queries.ts b/qa-core/src/internal-api/fixtures/queries.ts index 7ba81fc744..83839a0b41 100644 --- a/qa-core/src/internal-api/fixtures/queries.ts +++ b/qa-core/src/internal-api/fixtures/queries.ts @@ -72,4 +72,52 @@ export const expectedSchemaFields = { postal_code: "string", region: "string", }, + restAPI: { + abilities: "array", + base_experience: "number", + forms: "array", + game_indices: "array", + height: "number", + held_items: "array", + id: "number", + is_default: "string", + location_area_encounters: "string", + moves: "array", + name: "string", + order: "number", + past_types: "array", + species: "json", + sprites: "json", + stats: "array", + types: "array", + weight: "number", + }, +} + +const request = (datasourceId: string, fields: any, flags: any): any => { + return { + datasourceId: datasourceId, + fields: fields, + flags: flags, + name: "Query 1", + parameters: {}, + queryVerb: "read", + schema: {}, + transformer: "return data", + } +} +export const restAPI = (datasourceId: string): PreviewQueryRequest => { + const fields = { + authConfigId: null, + bodyType: "none", + disabledHeaders: {}, + headers: {}, + pagination: {}, + path: `${process.env.REST_API_BASE_URL}/pokemon/ditto`, + queryString: "", + } + const flags = { + urlName: true, + } + return request(datasourceId, fields, flags) } diff --git a/qa-core/src/internal-api/tests/dataSources/restAPI.spec.ts b/qa-core/src/internal-api/tests/dataSources/restAPI.spec.ts new file mode 100644 index 0000000000..d7b75db514 --- /dev/null +++ b/qa-core/src/internal-api/tests/dataSources/restAPI.spec.ts @@ -0,0 +1,69 @@ +import TestConfiguration from "../../config/TestConfiguration" +import * as fixtures from "../../fixtures" +import { Query } from "@budibase/types" + +describe("Internal API - Data Sources: REST API", () => { + const config = new TestConfiguration() + + beforeAll(async () => { + await config.beforeAll() + }) + + afterAll(async () => { + await config.afterAll() + }) + + it("Create an app with a data source - REST API", async () => { + // Create app + await config.createApp() + + // Get all integrations + await config.api.integrations.getAll() + + // Add data source + const [dataSourceResponse, dataSourceJson] = + await config.api.datasources.add(fixtures.datasources.restAPI()) + + // Update data source + const newDataSourceInfo = { + ...dataSourceJson.datasource, + name: "RestAPI - Updated", + } + const [updatedDataSourceResponse, updatedDataSourceJson] = + await config.api.datasources.update(newDataSourceInfo) + + // Query data source + const [queryResponse, queryJson] = await config.api.queries.preview( + fixtures.queries.restAPI(updatedDataSourceJson.datasource._id!) + ) + + expect(queryJson.rows.length).toEqual(1) + expect(queryJson.schemaFields).toEqual( + fixtures.queries.expectedSchemaFields.restAPI + ) + + // Save query + const datasourcetoSave: Query = { + ...fixtures.queries.postgres(updatedDataSourceJson.datasource._id!), + parameters: [], + } + + const [saveQueryResponse, saveQueryJson] = await config.api.queries.save( + datasourcetoSave + ) + // Get Query + const [getQueryResponse, getQueryJson] = await config.api.queries.get( + saveQueryJson._id! + ) + + // Get Query permissions + const [getQueryPermissionsResponse, getQueryPermissionsJson] = + await config.api.permissions.getAll(saveQueryJson._id!) + + // Delete data source + const deleteResponse = await config.api.datasources.delete( + updatedDataSourceJson.datasource._id!, + updatedDataSourceJson.datasource._rev! + ) + }) +}) From f104e66acf1c9885d5706e627ffb9e7b7eeaeaa7 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Fri, 14 Apr 2023 18:14:47 +0100 Subject: [PATCH 007/521] Fix type --- qa-core/src/internal-api/api/apis/DatasourcesAPI.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts index 7b9d7af789..f29bb9d6bc 100644 --- a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts +++ b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts @@ -2,7 +2,7 @@ import { Response } from "node-fetch" import { Datasource, CreateDatasourceResponse, - UpdatedDatasourceResponse, + UpdateDatasourceResponse, } from "@budibase/types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" @@ -46,7 +46,7 @@ export default class DatasourcesAPI { return [response, json] } - async update(body: any): Promise<[Response, UpdatedDatasourceResponse]> { + async update(body: any): Promise<[Response, UpdateDatasourceResponse]> { const [response, json] = await this.client.put(`/datasources/${body._id}`, { body, }) From b12830626298b46b4ff5dac79eac6993dbdcba2c Mon Sep 17 00:00:00 2001 From: adrinr Date: Wed, 19 Apr 2023 16:47:48 +0100 Subject: [PATCH 008/521] Increase writethrough cache timeout --- packages/backend-core/src/cache/writethrough.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/backend-core/src/cache/writethrough.ts b/packages/backend-core/src/cache/writethrough.ts index a3b1ecc08d..e64c116663 100644 --- a/packages/backend-core/src/cache/writethrough.ts +++ b/packages/backend-core/src/cache/writethrough.ts @@ -47,7 +47,7 @@ async function put( type: LockType.TRY_ONCE, name: LockName.PERSIST_WRITETHROUGH, resource: key, - ttl: 1000, + ttl: 15000, }, async () => { const writeDb = async (toWrite: any) => { @@ -71,6 +71,7 @@ async function put( } } ) + if (!lockResponse.executed) { logWarn(`Ignoring redlock conflict in write-through cache`) } From 5c292bbecdbdb0d759151125a6471c1956d2150a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 20 Apr 2023 08:51:41 +0000 Subject: [PATCH 009/521] v2.5.5 --- 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 19903a71a0..00ecba3818 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.4", + "version": "2.5.5", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 7ccd1ab87c..59fa51b0d8 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.4", + "version": "2.5.5", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.5.4", + "@budibase/types": "^2.5.5", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e8db77cd38..94fc1b88fe 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.4", + "version": "2.5.5", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.5.4", - "@budibase/string-templates": "^2.5.4", + "@budibase/shared-core": "^2.5.5", + "@budibase/string-templates": "^2.5.5", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 622f38cd4d..f8c342ceb0 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.4", + "version": "2.5.5", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.4", - "@budibase/client": "^2.5.4", - "@budibase/frontend-core": "^2.5.4", - "@budibase/shared-core": "^2.5.4", - "@budibase/string-templates": "^2.5.4", + "@budibase/bbui": "^2.5.5", + "@budibase/client": "^2.5.5", + "@budibase/frontend-core": "^2.5.5", + "@budibase/shared-core": "^2.5.5", + "@budibase/string-templates": "^2.5.5", "@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 0f9d6af51b..a1d28a6498 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.4", + "version": "2.5.5", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.5.4", - "@budibase/string-templates": "^2.5.4", - "@budibase/types": "^2.5.4", + "@budibase/backend-core": "^2.5.5", + "@budibase/string-templates": "^2.5.5", + "@budibase/types": "^2.5.5", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 3f0edbf7c7..b34dd39cd1 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.4", + "version": "2.5.5", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.5.4", - "@budibase/frontend-core": "^2.5.4", - "@budibase/shared-core": "^2.5.4", - "@budibase/string-templates": "^2.5.4", - "@budibase/types": "^2.5.4", + "@budibase/bbui": "^2.5.5", + "@budibase/frontend-core": "^2.5.5", + "@budibase/shared-core": "^2.5.5", + "@budibase/string-templates": "^2.5.5", + "@budibase/types": "^2.5.5", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 96bbb02e80..cd08d03463 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.4", + "version": "2.5.5", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.5.4", - "@budibase/shared-core": "^2.5.4", + "@budibase/bbui": "^2.5.5", + "@budibase/shared-core": "^2.5.5", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c564c8f8b1..bb66f0aaa7 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.4", + "version": "2.5.5", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 8d7c733616..8d480c4c69 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.4", + "version": "2.5.5", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.4", - "@budibase/client": "^2.5.4", + "@budibase/backend-core": "^2.5.5", + "@budibase/client": "^2.5.5", "@budibase/pro": "2.5.4", - "@budibase/shared-core": "^2.5.4", - "@budibase/string-templates": "^2.5.4", - "@budibase/types": "^2.5.4", + "@budibase/shared-core": "^2.5.5", + "@budibase/string-templates": "^2.5.5", + "@budibase/types": "^2.5.5", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index dba357b7b0..3694d98fc8 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.4", + "version": "2.5.5", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.5.4" + "@budibase/types": "^2.5.5" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ed72db5200..b2aaadb78f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.4", + "version": "2.5.5", "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 3b7b501882..8848ba6b9d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.4", + "version": "2.5.5", "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 a31969aa86..705b948aad 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.4", + "version": "2.5.5", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.4", + "@budibase/backend-core": "^2.5.5", "@budibase/pro": "2.5.4", - "@budibase/string-templates": "^2.5.4", - "@budibase/types": "^2.5.4", + "@budibase/string-templates": "^2.5.5", + "@budibase/types": "^2.5.5", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d21f8435d63e9a90b3adcf4c5c84fda842ddbcb7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 20 Apr 2023 08:55:19 +0000 Subject: [PATCH 010/521] Update pro version to 2.5.5 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 8d480c4c69..df8d6ebfd3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.5", "@budibase/client": "^2.5.5", - "@budibase/pro": "2.5.4", + "@budibase/pro": "2.5.5", "@budibase/shared-core": "^2.5.5", "@budibase/string-templates": "^2.5.5", "@budibase/types": "^2.5.5", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index da0aa05fc6..41b372f51e 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.4.tgz#0aa0b064181d548b86b8a38b0fe0d70009fec44e" - integrity sha512-YlywtDtEUp5kqPp09D81l8p9YR3xewbDZ5cPINpZ8LVfpS29NRTvIgVqcq5lDTYmXPAE78zJF8wdjT7dZsbNTw== +"@budibase/backend-core@2.5.5": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5.tgz#d1ae36564de447674a157790b1e8ebff5f42748c" + integrity sha512-mGQSK6wc4M6+KVpfsbcfijjOJaWreGnd0muLFrUYsogliglWDXeCTfdEXFMkhCyKEe+3TWeVkxVKzss6zSG+Mw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.4" + "@budibase/types" "^2.5.5" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.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": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5.tgz#8aa44b99baa8763d85f0ba3db92a178259dcf13e" + integrity sha512-dOUWWZGbFIumTfCQPmNSaTqlkLD6O/SK6H7IYY8FP67eMrLRZUanO3l0XgbjDiOdFIS1Hw5vvjHmunP0hQdLyw== dependencies: - "@budibase/backend-core" "2.5.4" + "@budibase/backend-core" "2.5.5" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.4" + "@budibase/types" "2.5.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.4", "@budibase/types@^2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.4.tgz#6a06e5f81beee05df3c5cab6eca693206b3b3084" - integrity sha512-cqqZaA9ZNNV6YawDpd3NMAN7/f3wwy5/bLtjiH6RhurQuZV7tUYnu0VQSUfWz/l7r5XgAsNCPOpiCvdDneSSKQ== +"@budibase/types@2.5.5", "@budibase/types@^2.5.5": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5.tgz#aca40d7e160e400b9a814fbaa7ad04d10dcf9672" + integrity sha512-caKRxeCfnXzMFCc2lfDhKREl4VsDqnAnT55339NHQFTpDrTFboY0bG6h6osNan5CQCafNCLtS32bz597frGT9A== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 705b948aad..d39fcb96ae 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.5", - "@budibase/pro": "2.5.4", + "@budibase/pro": "2.5.5", "@budibase/string-templates": "^2.5.5", "@budibase/types": "^2.5.5", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index cd6d83ec15..6c38f01998 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.4.tgz#0aa0b064181d548b86b8a38b0fe0d70009fec44e" - integrity sha512-YlywtDtEUp5kqPp09D81l8p9YR3xewbDZ5cPINpZ8LVfpS29NRTvIgVqcq5lDTYmXPAE78zJF8wdjT7dZsbNTw== +"@budibase/backend-core@2.5.5": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5.tgz#d1ae36564de447674a157790b1e8ebff5f42748c" + integrity sha512-mGQSK6wc4M6+KVpfsbcfijjOJaWreGnd0muLFrUYsogliglWDXeCTfdEXFMkhCyKEe+3TWeVkxVKzss6zSG+Mw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.4" + "@budibase/types" "^2.5.5" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.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": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5.tgz#8aa44b99baa8763d85f0ba3db92a178259dcf13e" + integrity sha512-dOUWWZGbFIumTfCQPmNSaTqlkLD6O/SK6H7IYY8FP67eMrLRZUanO3l0XgbjDiOdFIS1Hw5vvjHmunP0hQdLyw== dependencies: - "@budibase/backend-core" "2.5.4" + "@budibase/backend-core" "2.5.5" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.4" + "@budibase/types" "2.5.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.4", "@budibase/types@^2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.4.tgz#6a06e5f81beee05df3c5cab6eca693206b3b3084" - integrity sha512-cqqZaA9ZNNV6YawDpd3NMAN7/f3wwy5/bLtjiH6RhurQuZV7tUYnu0VQSUfWz/l7r5XgAsNCPOpiCvdDneSSKQ== +"@budibase/types@2.5.5", "@budibase/types@^2.5.5": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5.tgz#aca40d7e160e400b9a814fbaa7ad04d10dcf9672" + integrity sha512-caKRxeCfnXzMFCc2lfDhKREl4VsDqnAnT55339NHQFTpDrTFboY0bG6h6osNan5CQCafNCLtS32bz597frGT9A== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 145c0834bb9ead7c5c5dc26b0662a9bb8ff72853 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Thu, 20 Apr 2023 15:21:50 +0100 Subject: [PATCH 011/521] Fix for #10358 - making sure that client-side we don't check the content type for CSV, check if it might be JSON, if not assume we can try it as a CSV - this is a fix for an issue which occurs on Windows, in Firefox. (#10359) --- .../backend/TableNavigator/utils.js | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/packages/builder/src/components/backend/TableNavigator/utils.js b/packages/builder/src/components/backend/TableNavigator/utils.js index 658f037912..b7e46042be 100644 --- a/packages/builder/src/components/backend/TableNavigator/utils.js +++ b/packages/builder/src/components/backend/TableNavigator/utils.js @@ -42,16 +42,7 @@ export const parseFile = e => { reader.addEventListener("load", function (e) { const fileData = e.target.result - - if (file.type === "text/csv") { - API.csvToJson(fileData) - .then(rows => { - resolveRows(rows) - }) - .catch(() => { - reject("can't convert csv to json") - }) - } else if (file.type === "application/json") { + if (file.type?.includes("json")) { const parsedFileData = JSON.parse(fileData) if (Array.isArray(parsedFileData)) { @@ -62,7 +53,13 @@ export const parseFile = e => { reject("invalid json format") } } else { - reject("invalid file type") + API.csvToJson(fileData) + .then(rows => { + resolveRows(rows) + }) + .catch(() => { + reject("cannot parse csv") + }) } }) From 5a9c7d83b1864434035daf4e3a568507e685c0c8 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 20 Apr 2023 14:30:34 +0000 Subject: [PATCH 012/521] v2.5.6 --- 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 00ecba3818..a2c820416b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.5", + "version": "2.5.6", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 59fa51b0d8..33e2865c70 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", + "version": "2.5.6", "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", + "@budibase/types": "^2.5.6", "@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 94fc1b88fe..1c807d89e0 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", + "version": "2.5.6", "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", - "@budibase/string-templates": "^2.5.5", + "@budibase/shared-core": "^2.5.6", + "@budibase/string-templates": "^2.5.6", "@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 f8c342ceb0..97a61878ac 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.5", + "version": "2.5.6", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.5", - "@budibase/client": "^2.5.5", - "@budibase/frontend-core": "^2.5.5", - "@budibase/shared-core": "^2.5.5", - "@budibase/string-templates": "^2.5.5", + "@budibase/bbui": "^2.5.6", + "@budibase/client": "^2.5.6", + "@budibase/frontend-core": "^2.5.6", + "@budibase/shared-core": "^2.5.6", + "@budibase/string-templates": "^2.5.6", "@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 a1d28a6498..9017456266 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.5", + "version": "2.5.6", "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", - "@budibase/string-templates": "^2.5.5", - "@budibase/types": "^2.5.5", + "@budibase/backend-core": "^2.5.6", + "@budibase/string-templates": "^2.5.6", + "@budibase/types": "^2.5.6", "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 b34dd39cd1..c27aee9889 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.5", + "version": "2.5.6", "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", - "@budibase/frontend-core": "^2.5.5", - "@budibase/shared-core": "^2.5.5", - "@budibase/string-templates": "^2.5.5", - "@budibase/types": "^2.5.5", + "@budibase/bbui": "^2.5.6", + "@budibase/frontend-core": "^2.5.6", + "@budibase/shared-core": "^2.5.6", + "@budibase/string-templates": "^2.5.6", + "@budibase/types": "^2.5.6", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index cd08d03463..40eaf6b25e 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", + "version": "2.5.6", "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", - "@budibase/shared-core": "^2.5.5", + "@budibase/bbui": "^2.5.6", + "@budibase/shared-core": "^2.5.6", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index bb66f0aaa7..e335bcd39b 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.5", + "version": "2.5.6", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index df8d6ebfd3..bc138fc884 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", + "version": "2.5.6", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.5", - "@budibase/client": "^2.5.5", + "@budibase/backend-core": "^2.5.6", + "@budibase/client": "^2.5.6", "@budibase/pro": "2.5.5", - "@budibase/shared-core": "^2.5.5", - "@budibase/string-templates": "^2.5.5", - "@budibase/types": "^2.5.5", + "@budibase/shared-core": "^2.5.6", + "@budibase/string-templates": "^2.5.6", + "@budibase/types": "^2.5.6", "@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 3694d98fc8..9356dbc8d3 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", + "version": "2.5.6", "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" + "@budibase/types": "^2.5.6" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b2aaadb78f..fa3941f158 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", + "version": "2.5.6", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 8848ba6b9d..316f471001 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.5", + "version": "2.5.6", "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 d39fcb96ae..3426eafbd2 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", + "version": "2.5.6", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.5", + "@budibase/backend-core": "^2.5.6", "@budibase/pro": "2.5.5", - "@budibase/string-templates": "^2.5.5", - "@budibase/types": "^2.5.5", + "@budibase/string-templates": "^2.5.6", + "@budibase/types": "^2.5.6", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From cb0f321261a831ff8519e490721329338b4e726c Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 20 Apr 2023 14:33:28 +0000 Subject: [PATCH 013/521] Update pro version to 2.5.6 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index bc138fc884..1478976700 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.6", "@budibase/client": "^2.5.6", - "@budibase/pro": "2.5.5", + "@budibase/pro": "2.5.6", "@budibase/shared-core": "^2.5.6", "@budibase/string-templates": "^2.5.6", "@budibase/types": "^2.5.6", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 41b372f51e..2ef140b136 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5.tgz#d1ae36564de447674a157790b1e8ebff5f42748c" - integrity sha512-mGQSK6wc4M6+KVpfsbcfijjOJaWreGnd0muLFrUYsogliglWDXeCTfdEXFMkhCyKEe+3TWeVkxVKzss6zSG+Mw== +"@budibase/backend-core@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6.tgz#c9dc047eac01088b9bd47abe1392080a2a041cfd" + integrity sha512-XwNhe7e+hzP/ejByXSKfOXbtxnfK7wThNhkSNMRQJ0NC78QdJyjRNTezDCW0TA+ILueNhG2zF5KW0Eazq1YWxA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.5" + "@budibase/types" "^2.5.6" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5.tgz#8aa44b99baa8763d85f0ba3db92a178259dcf13e" - integrity sha512-dOUWWZGbFIumTfCQPmNSaTqlkLD6O/SK6H7IYY8FP67eMrLRZUanO3l0XgbjDiOdFIS1Hw5vvjHmunP0hQdLyw== +"@budibase/pro@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6.tgz#6f7311b67c2f4928f0885e91694310abcf8786b0" + integrity sha512-VTBcmazP5Bi2LukCnzZKmtDrw0zwa7TViB0oJKPKp6QIJP74VT+wSyLOk9OPqwtlAHAPeBfkE+mBdvF5vvj7TA== dependencies: - "@budibase/backend-core" "2.5.5" + "@budibase/backend-core" "2.5.6" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.5" + "@budibase/types" "2.5.6" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.5", "@budibase/types@^2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5.tgz#aca40d7e160e400b9a814fbaa7ad04d10dcf9672" - integrity sha512-caKRxeCfnXzMFCc2lfDhKREl4VsDqnAnT55339NHQFTpDrTFboY0bG6h6osNan5CQCafNCLtS32bz597frGT9A== +"@budibase/types@2.5.6", "@budibase/types@^2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6.tgz#b52566ebe54de5b515b4fc6eabfd6f279202fce1" + integrity sha512-WQVCcYJhj0hexi7BsayOgwpOC3AaMsA7azD4PjpifzaK0Ez+U2NzAT7oEZM9TL8aG8p4BvnTaAxP/Q9KRTdeRA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 3426eafbd2..3a7a27d883 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.6", - "@budibase/pro": "2.5.5", + "@budibase/pro": "2.5.6", "@budibase/string-templates": "^2.5.6", "@budibase/types": "^2.5.6", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 6c38f01998..fd40e06293 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5.tgz#d1ae36564de447674a157790b1e8ebff5f42748c" - integrity sha512-mGQSK6wc4M6+KVpfsbcfijjOJaWreGnd0muLFrUYsogliglWDXeCTfdEXFMkhCyKEe+3TWeVkxVKzss6zSG+Mw== +"@budibase/backend-core@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6.tgz#c9dc047eac01088b9bd47abe1392080a2a041cfd" + integrity sha512-XwNhe7e+hzP/ejByXSKfOXbtxnfK7wThNhkSNMRQJ0NC78QdJyjRNTezDCW0TA+ILueNhG2zF5KW0Eazq1YWxA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.5" + "@budibase/types" "^2.5.6" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5.tgz#8aa44b99baa8763d85f0ba3db92a178259dcf13e" - integrity sha512-dOUWWZGbFIumTfCQPmNSaTqlkLD6O/SK6H7IYY8FP67eMrLRZUanO3l0XgbjDiOdFIS1Hw5vvjHmunP0hQdLyw== +"@budibase/pro@2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6.tgz#6f7311b67c2f4928f0885e91694310abcf8786b0" + integrity sha512-VTBcmazP5Bi2LukCnzZKmtDrw0zwa7TViB0oJKPKp6QIJP74VT+wSyLOk9OPqwtlAHAPeBfkE+mBdvF5vvj7TA== dependencies: - "@budibase/backend-core" "2.5.5" + "@budibase/backend-core" "2.5.6" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.5" + "@budibase/types" "2.5.6" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.5", "@budibase/types@^2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5.tgz#aca40d7e160e400b9a814fbaa7ad04d10dcf9672" - integrity sha512-caKRxeCfnXzMFCc2lfDhKREl4VsDqnAnT55339NHQFTpDrTFboY0bG6h6osNan5CQCafNCLtS32bz597frGT9A== +"@budibase/types@2.5.6", "@budibase/types@^2.5.6": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6.tgz#b52566ebe54de5b515b4fc6eabfd6f279202fce1" + integrity sha512-WQVCcYJhj0hexi7BsayOgwpOC3AaMsA7azD4PjpifzaK0Ez+U2NzAT7oEZM9TL8aG8p4BvnTaAxP/Q9KRTdeRA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From afc5c99c6f3c67631ed243cf1e73745252d00b59 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 19:30:48 +0100 Subject: [PATCH 014/521] Revert "Merge pull request #10367 from Budibase/revert-10267-chore/pro_as_submodule" This reverts commit df18119b56fe7cf9154d371cbd9af25e8c509bff, reversing changes made to 676b85dbd847fb35e17b651c6de4cbfaca843d7b. --- .github/workflows/budibase_ci.yml | 87 ++++++++++++++++--------- .github/workflows/release-develop.yml | 46 ++++++------- .github/workflows/release-master.yml | 60 ++++++++--------- .gitmodules | 3 + .husky/post-checkout | 4 ++ docs/DEV-SETUP-DEBIAN.md | 13 +++- docs/DEV-SETUP-MACOSX.md | 12 +++- docs/DEV-SETUP-WINDOWS.md | 17 ++++- lerna.json | 16 ++++- package.json | 30 ++++++--- packages/backend-core/package.json | 2 - packages/backend-core/tsconfig.json | 11 +--- packages/builder/tsconfig.json | 8 +-- packages/cli/tsconfig.json | 19 ++---- packages/pro | 1 + packages/server/jest.config.ts | 6 +- packages/server/nodemon.json | 10 ++- packages/server/tsconfig.json | 8 +-- packages/shared-core/tsconfig.json | 3 +- packages/worker/jest.config.ts | 10 +-- packages/worker/nodemon.json | 8 ++- packages/worker/tsconfig.json | 18 ++--- qa-core/tsconfig.json | 18 ++--- scripts/bootstrap.sh | 7 ++ scripts/link-dependencies.sh | 32 +++------ scripts/pro/build.sh | 15 ----- scripts/pro/install.sh | 39 ----------- scripts/pro/release.sh | 94 --------------------------- scripts/pro/test.sh | 11 ---- tsconfig.json | 9 --- yarn.lock | 92 +++++++++++++++++++++++--- 31 files changed, 327 insertions(+), 382 deletions(-) create mode 100755 .husky/post-checkout create mode 160000 packages/pro create mode 100755 scripts/bootstrap.sh delete mode 100755 scripts/pro/build.sh delete mode 100755 scripts/pro/install.sh delete mode 100755 scripts/pro/release.sh delete mode 100755 scripts/pro/test.sh delete mode 100644 tsconfig.json diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 65e6529678..f4e0ddbd87 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -1,36 +1,25 @@ name: Budibase CI -on: - # Trigger the workflow on push or pull request, - # but only for the master branch - push: - branches: - - master - - develop - pull_request: +on: + # Trigger the workflow on push or pull request, + # but only for the master branch + push: branches: - master - develop - workflow_dispatch: + pull_request: + branches: + - master + - develop + workflow_dispatch: env: BRANCH: ${{ github.event.pull_request.head.ref }} BASE_BRANCH: ${{ github.event.pull_request.base.ref}} - PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }} + PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} jobs: lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Use Node.js 14.x - uses: actions/setup-node@v1 - with: - node-version: 14.x - - run: yarn - - run: yarn lint - - build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -38,8 +27,20 @@ jobs: uses: actions/setup-node@v1 with: node-version: 14.x - - name: Install Pro - run: yarn install:pro $BRANCH $BASE_BRANCH + - run: yarn + - run: yarn lint + + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + - name: Use Node.js 14.x + uses: actions/setup-node@v1 + with: + node-version: 14.x - run: yarn - run: yarn bootstrap - run: yarn build @@ -48,16 +49,17 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - name: Use Node.js 14.x uses: actions/setup-node@v1 with: node-version: 14.x - - name: Install Pro - run: yarn install:pro $BRANCH $BASE_BRANCH - run: yarn - run: yarn bootstrap - run: yarn build - - run: yarn test + - run: yarn test --ignore=@budibase/pro - uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos @@ -68,26 +70,28 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - name: Use Node.js 14.x uses: actions/setup-node@v1 with: node-version: 14.x - - name: Install Pro - run: yarn install:pro $BRANCH $BASE_BRANCH - run: yarn - run: yarn bootstrap - - run: yarn test:pro + - run: yarn test --scope=@budibase/pro integration-test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - name: Use Node.js 14.x uses: actions/setup-node@v1 with: node-version: 14.x - - name: Install Pro - run: yarn install:pro $BRANCH $BASE_BRANCH - run: yarn && yarn bootstrap && yarn build - run: | cd qa-core @@ -96,3 +100,24 @@ jobs: env: BB_ADMIN_USER_EMAIL: admin BB_ADMIN_USER_PASSWORD: admin + + check-pro-submodule: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + fetch-depth: 0 + - name: Check submodule + run: | + cd packages/pro + git fetch + if ! git merge-base --is-ancestor $(git log -n 1 --pretty=format:%H) origin/develop; then + echo "Current commit has not been merged to develop" + echo "Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md" + exit 1 + else + echo "All good, the submodule had been merged!" + fi diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 46e82e6efc..07ff0b20c7 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -1,21 +1,21 @@ name: Budibase Prerelease concurrency: release-prerelease -on: - push: +on: + push: branches: - develop paths: - - '.aws/**' - - '.github/**' - - 'charts/**' - - 'packages/**' - - 'scripts/**' - - 'package.json' - - 'yarn.lock' - - 'package.json' - - 'yarn.lock' - workflow_dispatch: + - ".aws/**" + - ".github/**" + - "charts/**" + - "packages/**" + - "scripts/**" + - "package.json" + - "yarn.lock" + - "package.json" + - "yarn.lock" + workflow_dispatch: env: # Posthog token used by ui at build time @@ -24,35 +24,35 @@ env: INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }} PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} FEATURE_PREVIEW_URL: https://budirelease.live - + jobs: release-images: - runs-on: ubuntu-latest + runs-on: ubuntu-latest steps: - name: Fail if branch is not develop - if: github.ref != 'refs/heads/develop' - run: | + if: github.ref != 'refs/heads/develop' + run: | echo "Ref is not develop, you must run this job from develop." exit 1 - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - uses: actions/setup-node@v1 with: node-version: 14.x - - name: Install Pro - run: yarn install:pro develop - - - run: yarn + - run: yarn - run: yarn bootstrap - run: yarn build - run: yarn build:sdk -# - run: yarn test + # - run: yarn test - name: Publish budibase packages to NPM env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - run: | + run: | # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" @@ -60,7 +60,7 @@ jobs: yarn release:develop - name: Build/release Docker images - run: | + run: | docker login -u $DOCKER_USER -p $DOCKER_PASSWORD yarn build:docker:develop env: diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index ab0771def5..e88fbbf0b8 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -2,55 +2,55 @@ name: Budibase Release concurrency: release on: - push: + push: branches: - master paths: - - '.aws/**' - - '.github/**' - - 'charts/**' - - 'packages/**' - - 'scripts/**' - - 'package.json' - - 'yarn.lock' - - 'package.json' - - 'yarn.lock' - workflow_dispatch: - inputs: - versioning: - type: choice - description: "Versioning type: patch, minor, major" - default: patch - options: - - patch - - minor - - major - required: true + - ".aws/**" + - ".github/**" + - "charts/**" + - "packages/**" + - "scripts/**" + - "package.json" + - "yarn.lock" + - "package.json" + - "yarn.lock" + workflow_dispatch: + inputs: + versioning: + type: choice + description: "Versioning type: patch, minor, major" + default: patch + options: + - patch + - minor + - major + required: true env: - # Posthog token used by ui at build time + # Posthog token used by ui at build time POSTHOG_TOKEN: phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }} SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }} + PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} jobs: release-images: runs-on: ubuntu-latest steps: - name: Fail if branch is not master - if: github.ref != 'refs/heads/master' - run: | + if: github.ref != 'refs/heads/master' + run: | echo "Ref is not master, you must run this job from master." exit 1 - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - uses: actions/setup-node@v1 with: node-version: 14.x - - name: Install Pro - run: yarn install:pro master - - run: yarn - run: yarn bootstrap - run: yarn lint @@ -68,12 +68,12 @@ jobs: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release - - name: 'Get Previous tag' + - name: "Get Previous tag" id: previoustag uses: "WyriHaximus/github-action-get-previous-tag@v1" - name: Build/release Docker images - run: | + run: | docker login -u $DOCKER_USER -p $DOCKER_PASSWORD yarn build yarn build:docker diff --git a/.gitmodules b/.gitmodules index e69de29bb2..2dd6ea53f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "packages/pro"] + path = packages/pro + url = git@github.com:Budibase/budibase-pro.git diff --git a/.husky/post-checkout b/.husky/post-checkout new file mode 100755 index 0000000000..506b8bf5af --- /dev/null +++ b/.husky/post-checkout @@ -0,0 +1,4 @@ +# .husky/post-checkout +# ... + +git config submodule.recurse true \ No newline at end of file diff --git a/docs/DEV-SETUP-DEBIAN.md b/docs/DEV-SETUP-DEBIAN.md index cfd7eebf47..a8b1e3dce4 100644 --- a/docs/DEV-SETUP-DEBIAN.md +++ b/docs/DEV-SETUP-DEBIAN.md @@ -1,13 +1,17 @@ ## Dev Environment on Debian 11 ### Install NVM & Node 14 + NVM documentation: https://github.com/nvm-sh/nvm#installing-and-updating Install NVM + ``` curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash ``` + Install Node 14 + ``` nvm install 14 ``` @@ -17,13 +21,16 @@ nvm install 14 ``` npm install -g yarn jest lerna ``` + ### Install Docker and Docker Compose ``` apt install docker.io pip3 install docker-compose ``` + ### Clone the repo + ``` git clone https://github.com/Budibase/budibase.git ``` @@ -44,10 +51,13 @@ This setup process was tested on Debian 11 (bullseye) with version numbers show cd budibase yarn setup ``` + The yarn setup command runs several build steps i.e. + ``` node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev ``` + So this command will actually run the application in dev mode. It creates .env files under `./packages/server` and `./packages/worker` and runs docker containers for each service via docker-compose. The dev version will be available on port 10000 i.e. @@ -55,6 +65,7 @@ The dev version will be available on port 10000 i.e. http://127.0.0.1:10000/builder/admin ### File descriptor issues with Vite and Chrome in Linux + If your dev environment stalls forever, with some network requests stuck in flight, it's likely that Chrome is trying to open more file descriptors than your system allows. To fix this, apply the following tweaks. @@ -62,4 +73,4 @@ Debian based distros: Add `* - nofile 65536` to `/etc/security/limits.conf`. Arch: -Add `DefaultLimitNOFILE=65536` to `/etc/systemd/system.conf`. \ No newline at end of file +Add `DefaultLimitNOFILE=65536` to `/etc/systemd/system.conf`. diff --git a/docs/DEV-SETUP-MACOSX.md b/docs/DEV-SETUP-MACOSX.md index 67eb5506ff..94ed3fc1ee 100644 --- a/docs/DEV-SETUP-MACOSX.md +++ b/docs/DEV-SETUP-MACOSX.md @@ -4,14 +4,14 @@ Install instructions [here](https://brew.sh/) -| **NOTE**: If you are working on a M1 Apple Silicon which is running Z shell, you could need to add -`eval $(/opt/homebrew/bin/brew shellenv)` line to your `.zshrc`. This will make your zsh to find the apps you install +| **NOTE**: If you are working on a M1 Apple Silicon which is running Z shell, you could need to add +`eval $(/opt/homebrew/bin/brew shellenv)` line to your `.zshrc`. This will make your zsh to find the apps you install through brew. - ### Install Node Budibase requires a recent version of node 14: + ``` brew install node npm node -v @@ -22,12 +22,15 @@ node -v ``` npm install -g yarn jest lerna ``` + ### Install Docker and Docker Compose ``` brew install docker docker-compose ``` + ### Clone the repo + ``` git clone https://github.com/Budibase/budibase.git ``` @@ -48,10 +51,13 @@ This setup process was tested on Mac OSX 12 (Monterey) with version numbers show cd budibase yarn setup ``` + The yarn setup command runs several build steps i.e. + ``` node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev ``` + So this command will actually run the application in dev mode. It creates .env files under `./packages/server` and `./packages/worker` and runs docker containers for each service via docker-compose. The dev version will be available on port 10000 i.e. diff --git a/docs/DEV-SETUP-WINDOWS.md b/docs/DEV-SETUP-WINDOWS.md index c5608b7567..176e0700d7 100644 --- a/docs/DEV-SETUP-WINDOWS.md +++ b/docs/DEV-SETUP-WINDOWS.md @@ -1,13 +1,15 @@ ## Dev Environment on Windows 10/11 (WSL2) - ### Install WSL with Ubuntu LTS Enable WSL 2 on Windows 10/11 for docker support. + ``` wsl --set-default-version 2 ``` + Install Ubuntu LTS. + ``` wsl --install Ubuntu ``` @@ -16,6 +18,7 @@ Or follow the instruction here: https://learn.microsoft.com/en-us/windows/wsl/install ### Install Docker in windows + Download the installer from docker and install it. Check this url for more detailed instructions: @@ -24,18 +27,21 @@ https://docs.docker.com/desktop/install/windows-install/ You should follow the next steps from within the Ubuntu terminal. ### Install NVM & Node 14 + NVM documentation: https://github.com/nvm-sh/nvm#installing-and-updating Install NVM + ``` curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash ``` + Install Node 14 + ``` nvm install 14 ``` - ### Install npm requirements ``` @@ -43,6 +49,7 @@ npm install -g yarn jest lerna ``` ### Clone the repo + ``` git clone https://github.com/Budibase/budibase.git ``` @@ -63,10 +70,13 @@ This setup process was tested on Windows 11 with version numbers show below. You cd budibase yarn setup ``` + The yarn setup command runs several build steps i.e. + ``` node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev ``` + So this command will actually run the application in dev mode. It creates .env files under `./packages/server` and `./packages/worker` and runs docker containers for each service via docker-compose. The dev version will be available on port 10000 i.e. @@ -74,8 +84,9 @@ The dev version will be available on port 10000 i.e. http://127.0.0.1:10000/builder/admin ### Working with the code + Here are the instructions to work on the application from within Visual Studio Code (in Windows) through the WSL. All the commands and files are within the Ubuntu system and it should run as if you were working on a Linux machine. https://code.visualstudio.com/docs/remote/wsl -Note you will be able to run the application from within the WSL terminal and you will be able to access the application from the a browser in Windows. \ No newline at end of file +Note you will be able to run the application from within the WSL terminal and you will be able to access the application from the a browser in Windows. diff --git a/lerna.json b/lerna.json index 1d55e1c029..6461309d43 100644 --- a/lerna.json +++ b/lerna.json @@ -1,8 +1,22 @@ { "version": "2.5.6-alpha.12", "npmClient": "yarn", + "packages": [ + "packages/backend-core", + "packages/bbui", + "packages/builder", + "packages/cli", + "packages/client", + "packages/frontend-core", + "packages/sdk", + "packages/server", + "packages/shared-core", + "packages/string-templates", + "packages/types", + "packages/worker", + "packages/pro/packages/pro" + ], "useWorkspaces": true, - "packages": ["packages/*"], "command": { "publish": { "ignoreChanges": [ diff --git a/package.json b/package.json index e944a5bf5e..32807dc963 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "eslint": "^7.28.0", "eslint-plugin-cypress": "^2.11.3", "eslint-plugin-svelte3": "^3.2.0", - "husky": "^7.0.1", + "husky": "^8.0.3", "js-yaml": "^4.1.0", "kill-port": "^1.6.1", "lerna": "^6.6.1", @@ -21,18 +21,16 @@ "typescript": "4.7.3" }, "scripts": { - "setup": "node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", - "bootstrap": "lerna link && ./scripts/link-dependencies.sh", + "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", + "bootstrap": "./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh", "build": "lerna run --stream build", - "build:dev": "lerna run --stream prebuild && tsc --build --watch --preserveWatchOutput", + "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput", "backend:bootstrap": "./scripts/scopeBackend.sh && yarn run bootstrap", "backend:build": "./scripts/scopeBackend.sh 'lerna run --stream build'", "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish && yarn release:pro", "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop --exact && yarn release:pro:develop", - "release:pro": "bash scripts/pro/release.sh", - "release:pro:develop": "bash scripts/pro/release.sh develop", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", @@ -46,7 +44,6 @@ "dev:server": "yarn run kill-server && lerna run --stream --parallel dev:builder --concurrency 1 --scope @budibase/backend-core --scope @budibase/worker --scope @budibase/server", "dev:built": "cd packages/server && yarn dev:stack:up && cd ../../ && lerna run --stream --parallel dev:built", "test": "lerna run --stream test --stream", - "test:pro": "bash scripts/pro/test.sh", "lint:eslint": "eslint packages && eslint qa-core", "lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\" && prettier --check \"qa-core/**/*.{js,ts,svelte}\"", "lint": "yarn run lint:eslint && yarn run lint:prettier", @@ -82,12 +79,25 @@ "mode:account": "yarn mode:cloud && yarn env:account:enable", "security:audit": "node scripts/audit.js", "postinstall": "husky install", - "install:pro": "bash scripts/pro/install.sh", - "dep:clean": "yarn clean && yarn bootstrap" + "dep:clean": "yarn clean -y && yarn bootstrap", + "submodules:load": "git submodule init && git submodule update && yarn && yarn bootstrap", + "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap" }, "workspaces": { "packages": [ - "packages/*" + "packages/backend-core", + "packages/bbui", + "packages/builder", + "packages/cli", + "packages/client", + "packages/frontend-core", + "packages/sdk", + "packages/server", + "packages/shared-core", + "packages/string-templates", + "packages/types", + "packages/worker", + "packages/pro/packages/pro" ] } } diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 134ea04b75..4310827818 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -15,8 +15,6 @@ "prebuild": "rimraf dist/", "prepack": "cp package.json dist", "build": "tsc -p tsconfig.build.json", - "build:pro": "../../scripts/pro/build.sh", - "postbuild": "yarn run build:pro", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "test": "bash scripts/test.sh", "test:watch": "jest --watchAll" diff --git a/packages/backend-core/tsconfig.json b/packages/backend-core/tsconfig.json index e95fb9ab4d..2b1419b051 100644 --- a/packages/backend-core/tsconfig.json +++ b/packages/backend-core/tsconfig.json @@ -7,11 +7,6 @@ "@budibase/types": ["../types/src"] } }, - "references": [ - { "path": "../types" } - ], - "exclude": [ - "node_modules", - "dist", - ] -} \ No newline at end of file + + "exclude": ["node_modules", "dist"] +} diff --git a/packages/builder/tsconfig.json b/packages/builder/tsconfig.json index 1c018ab983..400f964e30 100644 --- a/packages/builder/tsconfig.json +++ b/packages/builder/tsconfig.json @@ -13,9 +13,5 @@ }, "ts-node": { "require": ["tsconfig-paths/register"] - }, - "references": [ - { "path": "../types" }, - { "path": "../backend-core" }, - ] -} \ No newline at end of file + } +} diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index b60cb7eed3..61e83c7c45 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -8,23 +8,14 @@ "paths": { "@budibase/types": ["../types/src"], "@budibase/backend-core": ["../backend-core/src"], - "@budibase/backend-core/*": ["../backend-core/*"], + "@budibase/backend-core/*": ["../backend-core/*"] } }, "ts-node": { "require": ["tsconfig-paths/register"], "swc": true }, - "references": [ - { "path": "../types" }, - { "path": "../backend-core" }, - ], - "include": [ - "src/**/*", - "package.json" - ], - "exclude": [ - "node_modules", - "dist" - ] -} \ No newline at end of file + + "include": ["src/**/*", "package.json"], + "exclude": ["node_modules", "dist"] +} diff --git a/packages/pro b/packages/pro new file mode 160000 index 0000000000..315e57dc91 --- /dev/null +++ b/packages/pro @@ -0,0 +1 @@ +Subproject commit 315e57dc9185dede169af073a01cc23e673b7091 diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index b1498cdad7..6a732a9591 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -20,9 +20,9 @@ const baseConfig: Config.InitialProjectOptions = { } // add pro sources if they exist -if (fs.existsSync("../../../budibase-pro")) { - baseConfig.moduleNameMapper["@budibase/pro"] = - "/../../../budibase-pro/packages/pro/src" +if (fs.existsSync("../pro/packages")) { + baseConfig.moduleNameMapper!["@budibase/pro"] = + "/../pro/packages/pro/src" } const config: Config.InitialOptions = { diff --git a/packages/server/nodemon.json b/packages/server/nodemon.json index c27f3aeaf3..b7d4d623c7 100644 --- a/packages/server/nodemon.json +++ b/packages/server/nodemon.json @@ -1,6 +1,10 @@ { - "watch": ["src", "../backend-core", "../../../budibase-pro/packages/pro"], + "watch": ["src", "../backend-core", "../pro/packages/pro"], "ext": "js,ts,json", - "ignore": ["src/**/*.spec.ts", "src/**/*.spec.js", "../backend-core/dist/**/*"], + "ignore": [ + "src/**/*.spec.ts", + "src/**/*.spec.js", + "../backend-core/dist/**/*" + ], "exec": "ts-node src/index.ts" -} \ No newline at end of file +} diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index 5f4ee1a701..06a3dfaab3 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -10,19 +10,13 @@ "@budibase/backend-core": ["../backend-core/src"], "@budibase/backend-core/*": ["../backend-core/*"], "@budibase/shared-core": ["../shared-core/src"], - "@budibase/pro": ["../../../budibase-pro/packages/pro/src"] + "@budibase/pro": ["../pro/packages/pro/src"] } }, "ts-node": { "require": ["tsconfig-paths/register"], "swc": true }, - "references": [ - { "path": "../types" }, - { "path": "../backend-core" }, - { "path": "../shared-core" }, - { "path": "../../../budibase-pro/packages/pro" } - ], "include": ["src/**/*", "specs", "package.json"], "exclude": ["node_modules", "dist"] } diff --git a/packages/shared-core/tsconfig.json b/packages/shared-core/tsconfig.json index 58c9a25d5e..ebfec9c3a5 100644 --- a/packages/shared-core/tsconfig.json +++ b/packages/shared-core/tsconfig.json @@ -6,6 +6,5 @@ "paths": { "@budibase/types": ["../types/src"] } - }, - "references": [{ "path": "../types" }] + } } diff --git a/packages/worker/jest.config.ts b/packages/worker/jest.config.ts index 3655479d82..2b0d8fe23b 100644 --- a/packages/worker/jest.config.ts +++ b/packages/worker/jest.config.ts @@ -20,11 +20,11 @@ const config: Config.InitialOptions = { } // add pro sources if they exist -if (fs.existsSync("../../../budibase-pro")) { - config.moduleNameMapper["@budibase/pro/(.*)"] = - "/../../../budibase-pro/packages/pro/$1" - config.moduleNameMapper["@budibase/pro"] = - "/../../../budibase-pro/packages/pro/src" +if (fs.existsSync("../pro/packages")) { + config.moduleNameMapper!["@budibase/pro/(.*)"] = + "/../pro/packages/pro/$1" + config.moduleNameMapper!["@budibase/pro"] = + "/../pro/packages/pro/src" } export default config diff --git a/packages/worker/nodemon.json b/packages/worker/nodemon.json index e5184939ff..b7d4d623c7 100644 --- a/packages/worker/nodemon.json +++ b/packages/worker/nodemon.json @@ -1,6 +1,10 @@ { - "watch": ["src", "../backend-core", "../../../budibase-pro/packages/pro"], + "watch": ["src", "../backend-core", "../pro/packages/pro"], "ext": "js,ts,json", - "ignore": ["src/**/*.spec.ts", "src/**/*.spec.js", "../backend-core/dist/**/*"], + "ignore": [ + "src/**/*.spec.ts", + "src/**/*.spec.js", + "../backend-core/dist/**/*" + ], "exec": "ts-node src/index.ts" } diff --git a/packages/worker/tsconfig.json b/packages/worker/tsconfig.json index 3c8500d248..0b6ecd7f66 100644 --- a/packages/worker/tsconfig.json +++ b/packages/worker/tsconfig.json @@ -9,23 +9,13 @@ "@budibase/types": ["../types/src"], "@budibase/backend-core": ["../backend-core/src"], "@budibase/backend-core/*": ["../backend-core/*"], - "@budibase/pro": ["../../../budibase-pro/packages/pro/src"] + "@budibase/pro": ["../pro/packages/pro/src"] } }, "ts-node": { "require": ["tsconfig-paths/register"], "swc": true }, - "references": [ - { "path": "../types" }, - { "path": "../backend-core" }, - { "path": "../../../budibase-pro/packages/pro" } - ], - "include": [ - "src/**/*", - "package.json" - ], - "exclude": [ - "dist" - ] -} \ No newline at end of file + "include": ["src/**/*", "package.json"], + "exclude": ["dist"] +} diff --git a/qa-core/tsconfig.json b/qa-core/tsconfig.json index 8cd0c30d46..f8a2eedea0 100644 --- a/qa-core/tsconfig.json +++ b/qa-core/tsconfig.json @@ -16,22 +16,12 @@ "@budibase/types": ["../packages/types/src"], "@budibase/backend-core": ["../packages/backend-core/src"], "@budibase/backend-core/*": ["../packages/backend-core/*"], - "@budibase/server/*": ["../packages/server/src/*"], + "@budibase/server/*": ["../packages/server/src/*"] } }, "ts-node": { "require": ["tsconfig-paths/register"] }, - "references": [ - { "path": "../packages/types" }, - { "path": "../packages/backend-core" }, - ], - "include": [ - "src/**/*", - "package.json" - ], - "exclude": [ - "node_modules", - "dist" - ] -} \ No newline at end of file + "include": ["src/**/*", "package.json"], + "exclude": ["node_modules", "dist"] +} diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh new file mode 100755 index 0000000000..4e7eadc4ab --- /dev/null +++ b/scripts/bootstrap.sh @@ -0,0 +1,7 @@ +if [ -d "packages/pro/packages" ]; then + cd packages/pro + + yarn + lerna bootstrap + yarn setup +fi \ No newline at end of file diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh index 31d99fda3c..aee03e2c09 100755 --- a/scripts/link-dependencies.sh +++ b/scripts/link-dependencies.sh @@ -34,33 +34,17 @@ yarn unlink yarn link cd - -if [ -d "../budibase-pro" ]; then - cd ../budibase-pro - echo "Bootstrapping budibase-pro" - yarn bootstrap +if [ -d packages/pro/packages ]; then + pro_loaded_locally=true +else + pro_loaded_locally=false +fi - cd packages/pro +if [ $pro_loaded_locally = true ]; then echo "Linking pro" + cd packages/pro/packages/pro yarn unlink yarn link - - echo "Linking backend-core to pro" - yarn link '@budibase/backend-core' - - echo "Linking types to pro" - yarn link '@budibase/types' - - echo "Linking string-templates to pro" - yarn link '@budibase/string-templates' - - cd ../../../budibase - - echo "Linking pro to worker" - cd packages/worker && yarn link '@budibase/pro' - cd - - - echo "Linking pro to server" - cd packages/server && yarn link '@budibase/pro' cd - fi @@ -79,7 +63,7 @@ if [ -d "../account-portal" ]; then echo "Linking types to account-portal" yarn link "@budibase/types" - if [ -d "../../../budibase-pro" ]; then + if [ $pro_loaded_locally = true ]; then echo "Linking pro to account-portal" yarn link "@budibase/pro" fi diff --git a/scripts/pro/build.sh b/scripts/pro/build.sh deleted file mode 100755 index b03d85a0d0..0000000000 --- a/scripts/pro/build.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# This script is designed for building the pro repo after the backend-core build has completed. -# This ensures that any changes in core that are required by pro are done in the correct order. - -set -e - -# Go to parent of budibase -cd ../../../ - -if [[ -d "budibase-pro" ]]; then - cd budibase-pro - echo "Building pro" - yarn build -fi \ No newline at end of file diff --git a/scripts/pro/install.sh b/scripts/pro/install.sh deleted file mode 100755 index d6662d6341..0000000000 --- a/scripts/pro/install.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -if [[ -z "${CI}" ]]; then - echo 'Cannot run install.sh unless in CI' - exit 0 -fi - -BRANCH=$1 -BASE_BRANCH=$2 - -cd ../ -echo "Cloning pro repo..." -git clone https://$PERSONAL_ACCESS_TOKEN@github.com/Budibase/budibase-pro.git - -# Community forks won't be able to clone the pro repo as they can't access secrets -# Skip the rest of the installation and rely on npm version instead -# This should be ok as forks will not rely on pro changes -if [[ -d "budibase-pro" ]]; then - cd budibase-pro - - if [[ -z "${BRANCH}" ]]; then - echo Using GITHUB_REF_NAME: $GITHUB_REF_NAME - export BRANCH=$GITHUB_REF_NAME - fi - - # Try to checkout the matching pro branch - git checkout $BRANCH - - if [[ $? == "1" ]] && [[ $BASE_BRANCH ]]; then - # There is no matching branch, try to match the base branch - git checkout $BASE_BRANCH - fi - - # If neither branch exists continue with default branch 'develop' - git pull - - echo "Initializing pro repo..." - yarn -fi \ No newline at end of file diff --git a/scripts/pro/release.sh b/scripts/pro/release.sh deleted file mode 100755 index 1af7eea566..0000000000 --- a/scripts/pro/release.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -# Fail when any command fails -set -e - -if [[ -z "${CI}" ]]; then - echo 'Cannot run release.sh unless in CI' - exit 0 -fi - -############################################# -# SETUP # -############################################# - -# Release pro with same version as budibase -VERSION=$(jq -r .version lerna.json) -echo "Version: $VERSION" -COMMAND=$1 -echo "Command: $COMMAND" - -# Determine tag to use -TAG="" -if [[ $COMMAND == "develop" ]]; then - TAG="develop" -else - TAG="latest" -fi - -echo "Releasing version $VERSION" -echo "Releasing tag $TAG" - -############################################# -# PRE-PUBLISH # -############################################# - -# Go to pro repo root -cd ../budibase-pro - -# Install NPM credentials -echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc - -# Sync budibase dependency versions in packages/pro/package.json -# Ensures pro does not use out of date dependency -cd packages/pro -jq '.dependencies."@budibase/backend-core"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json -jq '.dependencies."@budibase/types"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json - -# Go back to pro repo root -cd - - -# Update lockfile with new dependency versions -yarn clean -y && yarn bootstrap - -# Commit and push -git add packages/pro/yarn.lock -git commit -m "Update dependency versions to $VERSION" -n -git push - -############################################# -# PUBLISH # -############################################# - -lerna publish $VERSION --yes --force-publish --dist-tag $TAG - -############################################# -# POST-PUBLISH - BUDIBASE # -############################################# - -# Go to budibase repo root -cd ../budibase - -# Update pro version in packages/server/package.json -cd packages/server -jq '.dependencies."@budibase/pro"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json - -# Go back to budibase repo root -cd - - -# Update pro version in packages/worker/package.json -cd packages/worker -jq '.dependencies."@budibase/pro"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json - -# Go back to budibase repo root -cd - - -# Update lockfile with new pro version -yarn clean -y && yarn bootstrap - -# Commit and push changes -git add packages/server/package.json -git add packages/worker/package.json -git add yarn.lock -git commit -m "Update pro version to $VERSION" -n -git push diff --git a/scripts/pro/test.sh b/scripts/pro/test.sh deleted file mode 100755 index 9c56b8be6b..0000000000 --- a/scripts/pro/test.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Fail when any command fails -set -e - -cd ../ -if [[ -d "budibase-pro" ]]; then - cd budibase-pro - yarn test - cd ../budibase -fi \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 8382281d99..0000000000 --- a/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "references": [ - { "path": "./packages/types" }, - { "path": "./packages/backend-core" }, - { "path": "./packages/server" }, - { "path": "./packages/worker" } - ], - "files" :[] -} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index fe9c6768d3..ff755fed6b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,6 +1386,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/backend-core@2.5.6-alpha.3": + version "2.5.6-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6-alpha.3.tgz#686d1533a3218507e4c82a58bf73caf875e0d895" + integrity sha512-TYaGj1G1h3K/QNwSanEFbwxlA04T3dc0DDHDgauyvqX8kHXYhY11BDn8xqrCQrpqXC7XlC4nL78NrhZiDJ+eFA== + dependencies: + "@budibase/nano" "10.1.2" + "@budibase/pouchdb-replication-stream" "1.2.10" + "@budibase/types" "2.5.6-alpha.3" + "@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" + "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1547,6 +1586,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.6-alpha.3": + version "2.5.6-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6-alpha.3.tgz#fd7656599d388d2d5a21806b9058a2656793ec87" + integrity sha512-SD9WTXb2A+3jqEEk8HoEDwphm5tiwfQWiBFOzTZlooWiS5M6UGxKCgXzPv0Ad9Pfxi2oGxfGh7qJcNgHQDoE3Q== + 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" @@ -3007,7 +3053,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== -"@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13": version "1.4.15" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== @@ -3717,7 +3763,7 @@ dependencies: slash "^3.0.0" -"@rollup/plugin-commonjs@^16.0.0": +"@rollup/plugin-commonjs@16.0.0", "@rollup/plugin-commonjs@^16.0.0": version "16.0.0" resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-16.0.0.tgz#169004d56cd0f0a1d0f35915d31a036b0efe281f" integrity sha512-LuNyypCP3msCGVQJ7ki8PqYdpjfEkE/xtFa5DqlF+7IBD0JsfMZ87C58heSwIMint58sAUZbt3ITqOmdQv/dXw== @@ -3800,6 +3846,22 @@ "@rollup/pluginutils" "^3.1.0" magic-string "^0.25.7" +"@rollup/plugin-replace@^5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz#45f53501b16311feded2485e98419acb8448c61d" + integrity sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA== + dependencies: + "@rollup/pluginutils" "^5.0.1" + magic-string "^0.27.0" + +"@rollup/plugin-typescript@8.3.0": + version "8.3.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.3.0.tgz#bc1077fa5897b980fc27e376c4e377882c63e68b" + integrity sha512-I5FpSvLbtAdwJ+naznv+B4sjXZUcIvLLceYpITAn7wAP8W0wqc5noLdGIp9HGVntNhRWXctwPYrSSFQxtl0FPA== + dependencies: + "@rollup/pluginutils" "^3.1.0" + resolve "^1.17.0" + "@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" @@ -11698,7 +11760,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.2: +fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.1, fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -12880,10 +12942,10 @@ humanize-ms@^1.2.0, humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -husky@^7.0.1: - version "7.0.4" - resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535" - integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ== +husky@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184" + integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg== iconv-lite@0.4.24, iconv-lite@^0.4.15, iconv-lite@^0.4.24, iconv-lite@^0.4.5: version "0.4.24" @@ -16688,6 +16750,13 @@ magic-string@^0.26.2: dependencies: sourcemap-codec "^1.4.8" +magic-string@^0.27.0: + version "0.27.0" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3" + integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA== + dependencies: + "@jridgewell/sourcemap-codec" "^1.4.13" + make-dir@3.1.0, make-dir@^3.0.0, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" @@ -21417,6 +21486,13 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, dependencies: estree-walker "^0.6.1" +rollup@2.45.2: + version "2.45.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.45.2.tgz#8fb85917c9f35605720e92328f3ccbfba6f78b48" + integrity sha512-kRRU7wXzFHUzBIv0GfoFFIN3m9oteY4uAsKllIpQDId5cfnkWF2J130l+27dzDju0E6MScKiV0ZM5Bw8m4blYQ== + optionalDependencies: + fsevents "~2.3.1" + rollup@^2.36.2, rollup@^2.44.0, rollup@^2.45.2, rollup@^2.79.1: version "2.79.1" resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" @@ -23379,7 +23455,7 @@ timed-out@^4.0.1: resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA== -timekeeper@2.2.0: +timekeeper@2.2.0, timekeeper@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/timekeeper/-/timekeeper-2.2.0.tgz#9645731fce9e3280a18614a57a9d1b72af3ca368" integrity sha512-W3AmPTJWZkRwu+iSNxPIsLZ2ByADsOLbbLxe46UJyWj3mlYLlwucKiq+/dPm0l9wTzqoF3/2PH0AGFCebjq23A== From b75caa03a6f01f89a914d399cfe1306e8fb9e29f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 21 Apr 2023 17:25:55 +0100 Subject: [PATCH 015/521] updating production timeouts --- hosting/proxy/nginx.prod.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosting/proxy/nginx.prod.conf b/hosting/proxy/nginx.prod.conf index 8954106feb..dce1a71918 100644 --- a/hosting/proxy/nginx.prod.conf +++ b/hosting/proxy/nginx.prod.conf @@ -222,9 +222,9 @@ http { rewrite ^/files/signed/(.*)$ /$1 break; } - client_header_timeout 60; - client_body_timeout 60; - keepalive_timeout 60; + client_header_timeout 120; + client_body_timeout 120; + keepalive_timeout 120; # gzip gzip on; From 93f7bd54d80dd8cd4e395a930bac2173741c076c Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 21 Apr 2023 17:29:12 +0000 Subject: [PATCH 016/521] v2.5.7 --- 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 a2c820416b..b9751a60cc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6", + "version": "2.5.7", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 33e2865c70..519a237914 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6", + "version": "2.5.7", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.5.6", + "@budibase/types": "^2.5.7", "@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 1c807d89e0..3634bcb844 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6", + "version": "2.5.7", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.5.6", - "@budibase/string-templates": "^2.5.6", + "@budibase/shared-core": "^2.5.7", + "@budibase/string-templates": "^2.5.7", "@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 97a61878ac..3c37ebcf34 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6", + "version": "2.5.7", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.6", - "@budibase/client": "^2.5.6", - "@budibase/frontend-core": "^2.5.6", - "@budibase/shared-core": "^2.5.6", - "@budibase/string-templates": "^2.5.6", + "@budibase/bbui": "^2.5.7", + "@budibase/client": "^2.5.7", + "@budibase/frontend-core": "^2.5.7", + "@budibase/shared-core": "^2.5.7", + "@budibase/string-templates": "^2.5.7", "@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 9017456266..49d81ee9b8 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6", + "version": "2.5.7", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.5.6", - "@budibase/string-templates": "^2.5.6", - "@budibase/types": "^2.5.6", + "@budibase/backend-core": "^2.5.7", + "@budibase/string-templates": "^2.5.7", + "@budibase/types": "^2.5.7", "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 c27aee9889..8a1247ee02 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6", + "version": "2.5.7", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.5.6", - "@budibase/frontend-core": "^2.5.6", - "@budibase/shared-core": "^2.5.6", - "@budibase/string-templates": "^2.5.6", - "@budibase/types": "^2.5.6", + "@budibase/bbui": "^2.5.7", + "@budibase/frontend-core": "^2.5.7", + "@budibase/shared-core": "^2.5.7", + "@budibase/string-templates": "^2.5.7", + "@budibase/types": "^2.5.7", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 40eaf6b25e..427e0a9733 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6", + "version": "2.5.7", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.5.6", - "@budibase/shared-core": "^2.5.6", + "@budibase/bbui": "^2.5.7", + "@budibase/shared-core": "^2.5.7", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e335bcd39b..daedad00df 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6", + "version": "2.5.7", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 1478976700..5e51e91068 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", + "version": "2.5.7", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.6", - "@budibase/client": "^2.5.6", + "@budibase/backend-core": "^2.5.7", + "@budibase/client": "^2.5.7", "@budibase/pro": "2.5.6", - "@budibase/shared-core": "^2.5.6", - "@budibase/string-templates": "^2.5.6", - "@budibase/types": "^2.5.6", + "@budibase/shared-core": "^2.5.7", + "@budibase/string-templates": "^2.5.7", + "@budibase/types": "^2.5.7", "@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 9356dbc8d3..e92306ddec 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6", + "version": "2.5.7", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.5.6" + "@budibase/types": "^2.5.7" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index fa3941f158..df3c0de5c3 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6", + "version": "2.5.7", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 316f471001..0bf0c8f58f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6", + "version": "2.5.7", "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 3a7a27d883..f800c38035 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", + "version": "2.5.7", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.6", + "@budibase/backend-core": "^2.5.7", "@budibase/pro": "2.5.6", - "@budibase/string-templates": "^2.5.6", - "@budibase/types": "^2.5.6", + "@budibase/string-templates": "^2.5.7", + "@budibase/types": "^2.5.7", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 9aa6e1e44d4b614ac1e1300a7fd678872c2f93bb Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 21 Apr 2023 17:32:17 +0000 Subject: [PATCH 017/521] Update pro version to 2.5.7 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5e51e91068..770d6748da 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.7", "@budibase/client": "^2.5.7", - "@budibase/pro": "2.5.6", + "@budibase/pro": "2.5.7", "@budibase/shared-core": "^2.5.7", "@budibase/string-templates": "^2.5.7", "@budibase/types": "^2.5.7", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 2ef140b136..f27070b38d 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6.tgz#c9dc047eac01088b9bd47abe1392080a2a041cfd" - integrity sha512-XwNhe7e+hzP/ejByXSKfOXbtxnfK7wThNhkSNMRQJ0NC78QdJyjRNTezDCW0TA+ILueNhG2zF5KW0Eazq1YWxA== +"@budibase/backend-core@2.5.7": + version "2.5.7" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.7.tgz#df392b2a10b827576265ea541b1a56c56a286d3e" + integrity sha512-GaqW5rkFAjiOnOtY8bof8eVtK/5N9gmN/AhgWvNpzSDy+1vq3U9pQGfKGp/iSJjkvL8woayf8NCyJfFWdxdAIA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.6" + "@budibase/types" "^2.5.7" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6.tgz#6f7311b67c2f4928f0885e91694310abcf8786b0" - integrity sha512-VTBcmazP5Bi2LukCnzZKmtDrw0zwa7TViB0oJKPKp6QIJP74VT+wSyLOk9OPqwtlAHAPeBfkE+mBdvF5vvj7TA== +"@budibase/pro@2.5.7": + version "2.5.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.7.tgz#5033d2648da2ec9d4d442171a2b201857a6ad955" + integrity sha512-XNcva7Jq0S2KmOGvDMceg31qs/3AgLhNZZfA86ziTeLOBTF4G1JwkCRw+cn63ApM7AhY+rgAWW4ZkRDPMz5VWQ== dependencies: - "@budibase/backend-core" "2.5.6" + "@budibase/backend-core" "2.5.7" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.6" + "@budibase/types" "2.5.7" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.6", "@budibase/types@^2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6.tgz#b52566ebe54de5b515b4fc6eabfd6f279202fce1" - integrity sha512-WQVCcYJhj0hexi7BsayOgwpOC3AaMsA7azD4PjpifzaK0Ez+U2NzAT7oEZM9TL8aG8p4BvnTaAxP/Q9KRTdeRA== +"@budibase/types@2.5.7", "@budibase/types@^2.5.7": + version "2.5.7" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.7.tgz#5879fbaa3781a0ff51df502de9ce04cbfcee6ec5" + integrity sha512-AMvHJD7ARM0X/ZFS1g+Zk6jqw/SQLeYuPWeJ3AVI6MyKM5P65FgfHmrgk81Cn2ExXmtbHky/N63qnOAhR6Hyqg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index f800c38035..d04c8d82a3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.7", - "@budibase/pro": "2.5.6", + "@budibase/pro": "2.5.7", "@budibase/string-templates": "^2.5.7", "@budibase/types": "^2.5.7", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index fd40e06293..317b95646e 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6.tgz#c9dc047eac01088b9bd47abe1392080a2a041cfd" - integrity sha512-XwNhe7e+hzP/ejByXSKfOXbtxnfK7wThNhkSNMRQJ0NC78QdJyjRNTezDCW0TA+ILueNhG2zF5KW0Eazq1YWxA== +"@budibase/backend-core@2.5.7": + version "2.5.7" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.7.tgz#df392b2a10b827576265ea541b1a56c56a286d3e" + integrity sha512-GaqW5rkFAjiOnOtY8bof8eVtK/5N9gmN/AhgWvNpzSDy+1vq3U9pQGfKGp/iSJjkvL8woayf8NCyJfFWdxdAIA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.6" + "@budibase/types" "^2.5.7" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6.tgz#6f7311b67c2f4928f0885e91694310abcf8786b0" - integrity sha512-VTBcmazP5Bi2LukCnzZKmtDrw0zwa7TViB0oJKPKp6QIJP74VT+wSyLOk9OPqwtlAHAPeBfkE+mBdvF5vvj7TA== +"@budibase/pro@2.5.7": + version "2.5.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.7.tgz#5033d2648da2ec9d4d442171a2b201857a6ad955" + integrity sha512-XNcva7Jq0S2KmOGvDMceg31qs/3AgLhNZZfA86ziTeLOBTF4G1JwkCRw+cn63ApM7AhY+rgAWW4ZkRDPMz5VWQ== dependencies: - "@budibase/backend-core" "2.5.6" + "@budibase/backend-core" "2.5.7" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.6" + "@budibase/types" "2.5.7" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.6", "@budibase/types@^2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6.tgz#b52566ebe54de5b515b4fc6eabfd6f279202fce1" - integrity sha512-WQVCcYJhj0hexi7BsayOgwpOC3AaMsA7azD4PjpifzaK0Ez+U2NzAT7oEZM9TL8aG8p4BvnTaAxP/Q9KRTdeRA== +"@budibase/types@2.5.7", "@budibase/types@^2.5.7": + version "2.5.7" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.7.tgz#5879fbaa3781a0ff51df502de9ce04cbfcee6ec5" + integrity sha512-AMvHJD7ARM0X/ZFS1g+Zk6jqw/SQLeYuPWeJ3AVI6MyKM5P65FgfHmrgk81Cn2ExXmtbHky/N63qnOAhR6Hyqg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 2f2084a426f0219eb65718714798d96f946cbd71 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 24 Apr 2023 08:47:42 +0000 Subject: [PATCH 018/521] v2.5.8 --- 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 b9751a60cc..b142e44eaf 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.7", + "version": "2.5.8", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 519a237914..9aae900b3a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.7", + "version": "2.5.8", "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.7", + "@budibase/types": "^2.5.8", "@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 3634bcb844..f27dbd36f8 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.7", + "version": "2.5.8", "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.7", - "@budibase/string-templates": "^2.5.7", + "@budibase/shared-core": "^2.5.8", + "@budibase/string-templates": "^2.5.8", "@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 3c37ebcf34..5dc9a8ada3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.7", + "version": "2.5.8", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.7", - "@budibase/client": "^2.5.7", - "@budibase/frontend-core": "^2.5.7", - "@budibase/shared-core": "^2.5.7", - "@budibase/string-templates": "^2.5.7", + "@budibase/bbui": "^2.5.8", + "@budibase/client": "^2.5.8", + "@budibase/frontend-core": "^2.5.8", + "@budibase/shared-core": "^2.5.8", + "@budibase/string-templates": "^2.5.8", "@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 49d81ee9b8..686bce341e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.7", + "version": "2.5.8", "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.7", - "@budibase/string-templates": "^2.5.7", - "@budibase/types": "^2.5.7", + "@budibase/backend-core": "^2.5.8", + "@budibase/string-templates": "^2.5.8", + "@budibase/types": "^2.5.8", "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 8a1247ee02..5f5cd9db23 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.7", + "version": "2.5.8", "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.7", - "@budibase/frontend-core": "^2.5.7", - "@budibase/shared-core": "^2.5.7", - "@budibase/string-templates": "^2.5.7", - "@budibase/types": "^2.5.7", + "@budibase/bbui": "^2.5.8", + "@budibase/frontend-core": "^2.5.8", + "@budibase/shared-core": "^2.5.8", + "@budibase/string-templates": "^2.5.8", + "@budibase/types": "^2.5.8", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 427e0a9733..126216e44b 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.7", + "version": "2.5.8", "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.7", - "@budibase/shared-core": "^2.5.7", + "@budibase/bbui": "^2.5.8", + "@budibase/shared-core": "^2.5.8", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index daedad00df..5ae5b2aa3e 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.7", + "version": "2.5.8", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 770d6748da..9d02b6e0fd 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.7", + "version": "2.5.8", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.7", - "@budibase/client": "^2.5.7", + "@budibase/backend-core": "^2.5.8", + "@budibase/client": "^2.5.8", "@budibase/pro": "2.5.7", - "@budibase/shared-core": "^2.5.7", - "@budibase/string-templates": "^2.5.7", - "@budibase/types": "^2.5.7", + "@budibase/shared-core": "^2.5.8", + "@budibase/string-templates": "^2.5.8", + "@budibase/types": "^2.5.8", "@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 e92306ddec..261d0b1794 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.7", + "version": "2.5.8", "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.7" + "@budibase/types": "^2.5.8" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index df3c0de5c3..fec938d306 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.7", + "version": "2.5.8", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 0bf0c8f58f..d6dd143ae2 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.7", + "version": "2.5.8", "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 d04c8d82a3..915d4de941 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.7", + "version": "2.5.8", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.7", + "@budibase/backend-core": "^2.5.8", "@budibase/pro": "2.5.7", - "@budibase/string-templates": "^2.5.7", - "@budibase/types": "^2.5.7", + "@budibase/string-templates": "^2.5.8", + "@budibase/types": "^2.5.8", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 9eef7acdb3016af76fbd88e6044afabc6d92eee7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 24 Apr 2023 08:50:28 +0000 Subject: [PATCH 019/521] Update pro version to 2.5.8 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 9d02b6e0fd..b32bb6c628 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.8", "@budibase/client": "^2.5.8", - "@budibase/pro": "2.5.7", + "@budibase/pro": "2.5.8", "@budibase/shared-core": "^2.5.8", "@budibase/string-templates": "^2.5.8", "@budibase/types": "^2.5.8", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index f27070b38d..0e9637194b 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.7.tgz#df392b2a10b827576265ea541b1a56c56a286d3e" - integrity sha512-GaqW5rkFAjiOnOtY8bof8eVtK/5N9gmN/AhgWvNpzSDy+1vq3U9pQGfKGp/iSJjkvL8woayf8NCyJfFWdxdAIA== +"@budibase/backend-core@2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.8.tgz#9976577fe7c0311333170910fdb2f1391f982e37" + integrity sha512-gHUXTRLg0MfdL7aEL8WiHtr1vSmpuEGt9iB/TgtEYbZOLCYkbLhWW9O51OqH82czLV+U5JOCyl+lg0r5mJxmVQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.7" + "@budibase/types" "^2.5.8" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.7.tgz#5033d2648da2ec9d4d442171a2b201857a6ad955" - integrity sha512-XNcva7Jq0S2KmOGvDMceg31qs/3AgLhNZZfA86ziTeLOBTF4G1JwkCRw+cn63ApM7AhY+rgAWW4ZkRDPMz5VWQ== +"@budibase/pro@2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.8.tgz#8d89339155726d6f55f94d291d62fc0772dd46b0" + integrity sha512-B0YKL+F0hCVqjxI4k2dTfbpy7SYD5Swtzn7s/77EulVEJTiADx5LNZQ4/lqmzz/ll6uC4/ofZT3hF0bF6jN8bQ== dependencies: - "@budibase/backend-core" "2.5.7" + "@budibase/backend-core" "2.5.8" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.7" + "@budibase/types" "2.5.8" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.7", "@budibase/types@^2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.7.tgz#5879fbaa3781a0ff51df502de9ce04cbfcee6ec5" - integrity sha512-AMvHJD7ARM0X/ZFS1g+Zk6jqw/SQLeYuPWeJ3AVI6MyKM5P65FgfHmrgk81Cn2ExXmtbHky/N63qnOAhR6Hyqg== +"@budibase/types@2.5.8", "@budibase/types@^2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.8.tgz#52842682e8fe4d8f103e97b98f381ca42a3e35c9" + integrity sha512-8IqeXHNiwGomu7N7nKXXiTdxneS8OHaCJ1r4z0boMRJEJiYXismhhMsxrwq95MFCtm+igj/ogBFWssop1/rXOw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 915d4de941..3829dba7cd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.8", - "@budibase/pro": "2.5.7", + "@budibase/pro": "2.5.8", "@budibase/string-templates": "^2.5.8", "@budibase/types": "^2.5.8", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 317b95646e..0861e25f33 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.7.tgz#df392b2a10b827576265ea541b1a56c56a286d3e" - integrity sha512-GaqW5rkFAjiOnOtY8bof8eVtK/5N9gmN/AhgWvNpzSDy+1vq3U9pQGfKGp/iSJjkvL8woayf8NCyJfFWdxdAIA== +"@budibase/backend-core@2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.8.tgz#9976577fe7c0311333170910fdb2f1391f982e37" + integrity sha512-gHUXTRLg0MfdL7aEL8WiHtr1vSmpuEGt9iB/TgtEYbZOLCYkbLhWW9O51OqH82czLV+U5JOCyl+lg0r5mJxmVQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.7" + "@budibase/types" "^2.5.8" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.7.tgz#5033d2648da2ec9d4d442171a2b201857a6ad955" - integrity sha512-XNcva7Jq0S2KmOGvDMceg31qs/3AgLhNZZfA86ziTeLOBTF4G1JwkCRw+cn63ApM7AhY+rgAWW4ZkRDPMz5VWQ== +"@budibase/pro@2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.8.tgz#8d89339155726d6f55f94d291d62fc0772dd46b0" + integrity sha512-B0YKL+F0hCVqjxI4k2dTfbpy7SYD5Swtzn7s/77EulVEJTiADx5LNZQ4/lqmzz/ll6uC4/ofZT3hF0bF6jN8bQ== dependencies: - "@budibase/backend-core" "2.5.7" + "@budibase/backend-core" "2.5.8" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.7" + "@budibase/types" "2.5.8" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.7", "@budibase/types@^2.5.7": - version "2.5.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.7.tgz#5879fbaa3781a0ff51df502de9ce04cbfcee6ec5" - integrity sha512-AMvHJD7ARM0X/ZFS1g+Zk6jqw/SQLeYuPWeJ3AVI6MyKM5P65FgfHmrgk81Cn2ExXmtbHky/N63qnOAhR6Hyqg== +"@budibase/types@2.5.8", "@budibase/types@^2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.8.tgz#52842682e8fe4d8f103e97b98f381ca42a3e35c9" + integrity sha512-8IqeXHNiwGomu7N7nKXXiTdxneS8OHaCJ1r4z0boMRJEJiYXismhhMsxrwq95MFCtm+igj/ogBFWssop1/rXOw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 0a83d8eec800ba76230b1a7f1b92fd42fef803b2 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 11:49:55 +0100 Subject: [PATCH 020/521] Remove release pro from commands --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 32807dc963..1c9dfa9205 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "backend:build": "./scripts/scopeBackend.sh 'lerna run --stream build'", "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", - "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish && yarn release:pro", - "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop --exact && yarn release:pro:develop", + "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", + "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop --exact", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From 25bc89a9b6f45250c7c092f776aebf628edc5c4a Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:08:05 +0100 Subject: [PATCH 021/521] Remove package versions --- packages/backend-core/package.json | 4 +- packages/bbui/package.json | 6 +- packages/builder/package.json | 12 +- packages/cli/package.json | 14 +- packages/client/package.json | 12 +- packages/frontend-core/package.json | 7 +- packages/pro | 2 +- packages/sdk/package.json | 2 +- packages/server/package.json | 14 +- packages/shared-core/package.json | 4 +- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 10 +- yarn.lock | 173 +++++++++++++++++++++---- 14 files changed, 193 insertions(+), 71 deletions(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0c1ba18896..b72805fb50 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -22,7 +22,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.19", + "@budibase/types": "latest", "@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 b3fe8ceabb..4145ce44c0 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.19", + "version": "0.0.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.6-alpha.19", - "@budibase/string-templates": "2.5.6-alpha.19", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", "@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 e9a7bfcc18..3c7d8abb7c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.19", - "@budibase/client": "2.5.6-alpha.19", - "@budibase/frontend-core": "2.5.6-alpha.19", - "@budibase/shared-core": "2.5.6-alpha.19", - "@budibase/string-templates": "2.5.6-alpha.19", + "@budibase/bbui": "latest", + "@budibase/client": "latest", + "@budibase/frontend-core": "latest", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", "@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 85b978d861..4a383237c0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,19 +29,13 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.19", - "@budibase/string-templates": "2.5.6-alpha.19", - "@budibase/types": "2.5.6-alpha.19", + "@budibase/backend-core": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "axios": "0.21.2", - "chalk": "4.1.0", - "cli-progress": "3.11.2", - "commander": "7.1.0", - "docker-compose": "0.23.12", - "dotenv": "16.0.1", "download": "8.0.0", "find-free-port": "^2.0.0", "inquirer": "8.0.0", - "joi": "17.6.0", "lookpath": "1.1.0", "node-fetch": "2.6.7", "pkg": "5.8.0", diff --git a/packages/client/package.json b/packages/client/package.json index 7745a6a6dd..15f1419a35 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.19", + "version": "0.0.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.6-alpha.19", - "@budibase/frontend-core": "2.5.6-alpha.19", - "@budibase/shared-core": "2.5.6-alpha.19", - "@budibase/string-templates": "2.5.6-alpha.19", - "@budibase/types": "2.5.6-alpha.19", + "@budibase/bbui": "latest", + "@budibase/frontend-core": "latest", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "@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 ebd34d8a71..d6a1aaadf4 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,14 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.19", + "version": "0.0.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.6-alpha.19", - "@budibase/shared-core": "2.5.6-alpha.19", - "dayjs": "^1.11.7", + "@budibase/bbui": "latest", + "@budibase/shared-core": "latest", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", "svelte": "^3.46.2" diff --git a/packages/pro b/packages/pro index 315e57dc91..bacbea4741 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 315e57dc9185dede169af073a01cc23e673b7091 +Subproject commit bacbea4741e2a94f8a88960f9e7f15ba0e8cba42 diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c442aeaf9e..7e8b74698d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.19", + "version": "0.0.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 39f72be12e..5a2681478d 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.19", + "version": "0.0.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.6-alpha.19", - "@budibase/client": "2.5.6-alpha.19", - "@budibase/pro": "2.5.6-alpha.19", - "@budibase/shared-core": "2.5.6-alpha.19", - "@budibase/string-templates": "2.5.6-alpha.19", - "@budibase/types": "2.5.6-alpha.19", + "@budibase/backend-core": "latest", + "@budibase/client": "latest", + "@budibase/pro": "latest", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "@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 5458d64f33..81f40a7b32 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.19", + "version": "0.0.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.6-alpha.19" + "@budibase/types": "latest" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6bd454753f..4ca866f18d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.19", + "version": "0.0.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 d5ec431892..6f6b5c9ec3 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.19", + "version": "0.0.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 8166643b30..ba825eb150 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.19", + "version": "0.0.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.6-alpha.19", - "@budibase/pro": "2.5.6-alpha.19", - "@budibase/string-templates": "2.5.6-alpha.19", - "@budibase/types": "2.5.6-alpha.19", + "@budibase/backend-core": "latest", + "@budibase/pro": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/yarn.lock b/yarn.lock index 817eb39f7f..307002fe06 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,14 +1386,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.6-alpha.3": - version "2.5.6-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6-alpha.3.tgz#686d1533a3218507e4c82a58bf73caf875e0d895" - integrity sha512-TYaGj1G1h3K/QNwSanEFbwxlA04T3dc0DDHDgauyvqX8kHXYhY11BDn8xqrCQrpqXC7XlC4nL78NrhZiDJ+eFA== +"@budibase/backend-core@2.5.5", "@budibase/backend-core@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5.tgz#d1ae36564de447674a157790b1e8ebff5f42748c" + integrity sha512-mGQSK6wc4M6+KVpfsbcfijjOJaWreGnd0muLFrUYsogliglWDXeCTfdEXFMkhCyKEe+3TWeVkxVKzss6zSG+Mw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.5.6-alpha.3" + "@budibase/types" "^2.5.5" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1408,7 +1408,6 @@ 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" @@ -1424,6 +1423,7 @@ 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" @@ -1475,6 +1475,104 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" +"@budibase/bbui@^2.5.5", "@budibase/bbui@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.5.5.tgz#860ab3f6cc1f8ada1f2cca1e8969e8390047800d" + integrity sha512-54kkCjOspcH25rybZ5+p1v6PfnyKouE7mQw73VFFh1AKSd+VORfLkMpwUm0w+Dsuoi1hBCA0k1eNLDY3md0+hg== + dependencies: + "@adobe/spectrum-css-workflow-icons" "1.2.1" + "@budibase/shared-core" "^2.5.5" + "@budibase/string-templates" "^2.5.5" + "@spectrum-css/accordion" "3.0.24" + "@spectrum-css/actionbutton" "1.0.1" + "@spectrum-css/actiongroup" "1.0.1" + "@spectrum-css/avatar" "3.0.2" + "@spectrum-css/button" "3.0.1" + "@spectrum-css/buttongroup" "3.0.2" + "@spectrum-css/checkbox" "3.0.2" + "@spectrum-css/dialog" "3.0.1" + "@spectrum-css/divider" "1.0.3" + "@spectrum-css/dropzone" "3.0.2" + "@spectrum-css/fieldgroup" "3.0.2" + "@spectrum-css/fieldlabel" "3.0.1" + "@spectrum-css/icon" "3.0.1" + "@spectrum-css/illustratedmessage" "3.0.2" + "@spectrum-css/inlinealert" "2.0.1" + "@spectrum-css/inputgroup" "3.0.2" + "@spectrum-css/label" "2.0.10" + "@spectrum-css/link" "3.1.1" + "@spectrum-css/menu" "3.0.1" + "@spectrum-css/modal" "3.0.1" + "@spectrum-css/pagination" "3.0.3" + "@spectrum-css/picker" "1.0.1" + "@spectrum-css/popover" "3.0.1" + "@spectrum-css/progressbar" "1.0.2" + "@spectrum-css/progresscircle" "1.0.2" + "@spectrum-css/radio" "3.0.2" + "@spectrum-css/search" "3.0.2" + "@spectrum-css/sidenav" "3.0.2" + "@spectrum-css/slider" "3.0.1" + "@spectrum-css/statuslight" "3.0.2" + "@spectrum-css/stepper" "3.0.3" + "@spectrum-css/switch" "1.0.2" + "@spectrum-css/table" "3.0.1" + "@spectrum-css/tabs" "3.2.12" + "@spectrum-css/tags" "3.0.2" + "@spectrum-css/textfield" "3.0.1" + "@spectrum-css/toast" "3.0.1" + "@spectrum-css/tooltip" "3.0.3" + "@spectrum-css/treeview" "3.0.2" + "@spectrum-css/typography" "3.0.1" + "@spectrum-css/underlay" "2.0.9" + "@spectrum-css/vars" "3.0.1" + dayjs "^1.10.4" + easymde "^2.16.1" + svelte-flatpickr "^3.2.3" + svelte-portal "^1.0.0" + +"@budibase/client@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.5.5.tgz#2647c34ab1ca50bcdd41bb48a3cd5afc8d53566a" + integrity sha512-PyyYTD8juGyGsQI2lyTymqIvBH3nflkuTv+XE1UrjVSrK5DJsW3e9/UiUWcDhOgX9Sq3Q3D8JMMGfSriwBEdLg== + dependencies: + "@budibase/bbui" "^2.5.5" + "@budibase/frontend-core" "^2.5.5" + "@budibase/shared-core" "^2.5.5" + "@budibase/string-templates" "^2.5.5" + "@budibase/types" "^2.5.5" + "@spectrum-css/button" "^3.0.3" + "@spectrum-css/card" "^3.0.3" + "@spectrum-css/divider" "^1.0.3" + "@spectrum-css/link" "^3.1.3" + "@spectrum-css/page" "^3.0.1" + "@spectrum-css/tag" "^3.1.4" + "@spectrum-css/typography" "^3.0.2" + "@spectrum-css/vars" "^3.0.1" + apexcharts "^3.22.1" + dayjs "^1.10.5" + downloadjs "1.4.7" + html5-qrcode "^2.2.1" + leaflet "^1.7.1" + regexparam "^1.3.0" + sanitize-html "^2.7.0" + screenfull "^6.0.1" + shortid "^2.2.15" + socket.io-client "^4.5.1" + svelte "^3.49.0" + svelte-apexcharts "^1.0.2" + svelte-flatpickr "^3.1.0" + svelte-spa-router "^3.0.5" + +"@budibase/frontend-core@^2.5.5", "@budibase/frontend-core@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.5.5.tgz#58f81e95c849b12d39cab3b8ac64c1d6ee37952b" + integrity sha512-U1xRQIFxeGiRJREEft5E3VwbW0KSJNRAww3Jd9WGhKXZIWIiIruwW1jeyX0ISFdIJqtOVt0Vow9s9DKcoroMew== + dependencies: + "@budibase/bbui" "^2.5.5" + "@budibase/shared-core" "^2.5.5" + lodash "^4.17.21" + svelte "^3.46.2" + "@budibase/handlebars-helpers@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" @@ -1525,15 +1623,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.18": - version "2.5.6-alpha.18" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.18.tgz#d75600c3fe11872403c47fa8c45e55f53cb6d02b" - integrity sha512-SnSHlVFkJocvrFJFBrBVHN1+2+aoqyPaB+qn22BX7x02AY5Yrj938n5yNAMrXVrsmiSc1shZQ5S09a4uDTw6Ww== +"@budibase/pro@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5.tgz#8aa44b99baa8763d85f0ba3db92a178259dcf13e" + integrity sha512-dOUWWZGbFIumTfCQPmNSaTqlkLD6O/SK6H7IYY8FP67eMrLRZUanO3l0XgbjDiOdFIS1Hw5vvjHmunP0hQdLyw== dependencies: - "@budibase/backend-core" "2.5.6-alpha.18" - "@budibase/shared-core" "2.4.44-alpha.1" - "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.18" + "@budibase/backend-core" "2.5.5" + "@budibase/string-templates" "2.3.20" + "@budibase/types" "2.5.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1541,8 +1638,6 @@ lru-cache "^7.14.1" memorystream "^0.3.1" node-fetch "^2.6.1" - scim-patch "^0.7.0" - scim2-parse-filter "^0.2.8" "@budibase/shared-core@2.4.44-alpha.1": version "2.4.44-alpha.1" @@ -1551,6 +1646,13 @@ dependencies: "@budibase/types" "2.4.44-alpha.1" +"@budibase/shared-core@^2.5.5", "@budibase/shared-core@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.5.tgz#8cd61edd27ad0e75f47a1cfaff724e5ad7f22844" + integrity sha512-JQZHqVsOntSg2LXxyGZLntn9jS83R77c9MklQ9zESDVcAqxMFVVc0UNpaaW+MaTkMWfbdPFqnZAYP30mkZGe2g== + dependencies: + "@budibase/types" "^2.5.5" + "@budibase/standard-components@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" @@ -1569,6 +1671,18 @@ 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== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.4" + "@budibase/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" @@ -1581,17 +1695,27 @@ lodash "^4.17.20" vm2 "^3.9.4" +"@budibase/string-templates@^2.5.5", "@budibase/string-templates@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.5.tgz#2cd506ca6612319713ec6407279bcbf8a9bb9fb2" + integrity sha512-7OyMlndEh3r5obT6SoZGQvg5aq033U1DnYJAzumcAKY4T/9ATHBUAGbJeVD/lFXEj9KcEIfd2A8JPXjxkrDDeQ== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.15" + "@budibase/types@2.4.44-alpha.1": version "2.4.44-alpha.1" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== -"@budibase/types@2.5.6-alpha.3": - version "2.5.6-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6-alpha.3.tgz#fd7656599d388d2d5a21806b9058a2656793ec87" - integrity sha512-SD9WTXb2A+3jqEEk8HoEDwphm5tiwfQWiBFOzTZlooWiS5M6UGxKCgXzPv0Ad9Pfxi2oGxfGh7qJcNgHQDoE3Q== - dependencies: - scim-patch "^0.7.0" +"@budibase/types@2.5.5", "@budibase/types@^2.5.5", "@budibase/types@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5.tgz#aca40d7e160e400b9a814fbaa7ad04d10dcf9672" + integrity sha512-caKRxeCfnXzMFCc2lfDhKREl4VsDqnAnT55339NHQFTpDrTFboY0bG6h6osNan5CQCafNCLtS32bz597frGT9A== "@bull-board/api@3.7.0": version "3.7.0" @@ -25382,3 +25506,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 9ddb148698ee49a5fe677bfd089224d96695feec Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:18:50 +0100 Subject: [PATCH 022/521] Add version file --- versions/package.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 versions/package.json diff --git a/versions/package.json b/versions/package.json new file mode 100644 index 0000000000..b350593f5a --- /dev/null +++ b/versions/package.json @@ -0,0 +1,3 @@ +{ + "version": "2.5.6-alpha.6" +} From 6ecb062acfb5c3d20b6541039f7ef6a123291252 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:24:23 +0100 Subject: [PATCH 023/521] Tag action --- .github/workflows/tag-prerelease.yml | 38 ++++++++++++++++++++++++++++ versions/package.json | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/tag-prerelease.yml diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml new file mode 100644 index 0000000000..51434f5248 --- /dev/null +++ b/.github/workflows/tag-prerelease.yml @@ -0,0 +1,38 @@ +name: Tag prerelease +concurrency: release-prerelease + +on: + push: + branches: + - develop + - chore/pipeline_npm_version_updates + paths: + - ".aws/**" + - ".github/**" + - "charts/**" + - "packages/**" + - "scripts/**" + - "package.json" + - "yarn.lock" + - "package.json" + - "yarn.lock" + workflow_dispatch: + +jobs: + tag-prerelease: + runs-on: ubuntu-latest + + steps: + - name: Fail if branch is not develop + if: github.ref != 'refs/heads/develop' + run: | + echo "Ref is not develop, you must run this job from develop." + exit 1 + - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + + - name: Tag prerelease + run: | + yarn version --prerelease --cwd="./versions" diff --git a/versions/package.json b/versions/package.json index b350593f5a..ef25fb2aaa 100644 --- a/versions/package.json +++ b/versions/package.json @@ -1,3 +1,3 @@ { - "version": "2.5.6-alpha.6" + "version": "0.0.999-alpha.6" } From e10eba944782b5ec8ac4bf09477096d259f4ca7d Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:25:38 +0100 Subject: [PATCH 024/521] Remove check --- .github/workflows/tag-prerelease.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 51434f5248..36bf26652c 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -23,11 +23,11 @@ jobs: runs-on: ubuntu-latest steps: - - name: Fail if branch is not develop - if: github.ref != 'refs/heads/develop' - run: | - echo "Ref is not develop, you must run this job from develop." - exit 1 + # - name: Fail if branch is not develop + # if: github.ref != 'refs/heads/develop' + # run: | + # echo "Ref is not develop, you must run this job from develop." + # exit 1 - uses: actions/checkout@v2 with: submodules: true From af8a27fa103ea90aca3bb8ccb376235da038785a Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:27:06 +0100 Subject: [PATCH 025/521] Setup git user --- .github/workflows/tag-prerelease.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 36bf26652c..877dd73fdc 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -35,4 +35,7 @@ jobs: - name: Tag prerelease run: | + # setup the username and email. + git config --global user.name "Budibase Staging Release Bot" + git config --global user.email "<>" yarn version --prerelease --cwd="./versions" From ca84e0c94c57135cb350ef4d5a0b9570f3b2057c Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:32:40 +0100 Subject: [PATCH 026/521] Push changes --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c9dfa9205..0d8e493fce 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,8 @@ "postinstall": "husky install", "dep:clean": "yarn clean -y && yarn bootstrap", "submodules:load": "git submodule init && git submodule update && yarn && yarn bootstrap", - "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap" + "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap", + "postversion": "git push --tags && git push && echo \"Successfully pushed version and tag $npm_package_version!\"" }, "workspaces": { "packages": [ From 8faed6cfbc8e57a24d868ec22d3ba47e219d2bc2 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:37:06 +0100 Subject: [PATCH 027/521] Move script --- package.json | 3 +-- versions/package.json | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 0d8e493fce..1c9dfa9205 100644 --- a/package.json +++ b/package.json @@ -81,8 +81,7 @@ "postinstall": "husky install", "dep:clean": "yarn clean -y && yarn bootstrap", "submodules:load": "git submodule init && git submodule update && yarn && yarn bootstrap", - "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap", - "postversion": "git push --tags && git push && echo \"Successfully pushed version and tag $npm_package_version!\"" + "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap" }, "workspaces": { "packages": [ diff --git a/versions/package.json b/versions/package.json index ef25fb2aaa..10299dc2b2 100644 --- a/versions/package.json +++ b/versions/package.json @@ -1,3 +1,6 @@ { - "version": "0.0.999-alpha.6" + "version": "0.0.999-alpha.6", + "scripts": { + "postversion": "git push --tags && git push && echo \"Successfully pushed version and tag $npm_package_version!\"" + } } From 1bcb481d69c0cc91ffa6532689e1400c8eaa8eaf Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:50:26 +0100 Subject: [PATCH 028/521] Change publish process --- .github/workflows/release-develop.yml | 27 +++++++++++++++++++-------- package.json | 2 +- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 07ff0b20c7..cf5e0e6b9f 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -3,8 +3,8 @@ concurrency: release-prerelease on: push: - branches: - - develop + tags: + - v*-alpha.* paths: - ".aws/**" - ".github/**" @@ -30,24 +30,35 @@ jobs: runs-on: ubuntu-latest steps: - - name: Fail if branch is not develop - if: github.ref != 'refs/heads/develop' - run: | - echo "Ref is not develop, you must run this job from develop." - exit 1 - uses: actions/checkout@v2 with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + fetch-depth: 1 + + - name: Fail if tag is not develop + run: | + if ! git merge-base --is-ancestor ${{ github.sha }} origin/develop; then + echo "Tag is not in develop" + exit 1 + fi + - uses: actions/setup-node@v1 with: node-version: 14.x - run: yarn + - name: Update versions + run: | + version=$(cat versions/package.json \ + | grep version \ + | head -1 \ + | awk -F: '{ print $2 }' \ + | sed 's/[",]//g') + yarn lerna exec "yarn version --no-git-tag-version --new-version=$tag" - run: yarn bootstrap - run: yarn build - run: yarn build:sdk - # - run: yarn test - name: Publish budibase packages to NPM env: diff --git a/package.json b/package.json index 1c9dfa9205..9f8bb7113c 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop --exact", + "release:develop": "npm publish", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From 5824b45c20a2d2b14ea051f9c9e19431d96321ff Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:53:16 +0100 Subject: [PATCH 029/521] Remove check for testing --- .github/workflows/release-develop.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index cf5e0e6b9f..d8db51ba44 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -36,12 +36,12 @@ jobs: token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} fetch-depth: 1 - - name: Fail if tag is not develop - run: | - if ! git merge-base --is-ancestor ${{ github.sha }} origin/develop; then - echo "Tag is not in develop" - exit 1 - fi + # - name: Fail if tag is not develop + # run: | + # if ! git merge-base --is-ancestor ${{ github.sha }} origin/develop; then + # echo "Tag is not in develop" + # exit 1 + # fi - uses: actions/setup-node@v1 with: From 4bc036c3901ed5c262d6d1e667e6399a75c31de8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 13:09:44 +0100 Subject: [PATCH 030/521] Use lerna --- .github/workflows/tag-prerelease.yml | 2 +- lerna.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 877dd73fdc..a0b6269eb3 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -38,4 +38,4 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - yarn version --prerelease --cwd="./versions" + lerna version prerelease --yes" diff --git a/lerna.json b/lerna.json index 5534b2f45d..bd0f708b01 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,7 @@ { "version": "2.5.6-alpha.19", "npmClient": "yarn", + "version": "0.0.999-alpha.9", "packages": [ "packages/backend-core", "packages/bbui", From 5f8451b6e5e8fb8c94d782c65525adc26ba506b4 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 13:13:38 +0100 Subject: [PATCH 031/521] Yarn lerna --- .github/workflows/tag-prerelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index a0b6269eb3..e359269d2e 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -38,4 +38,4 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - lerna version prerelease --yes" + yarn lerna version prerelease --yes" From dbc9f709749cd7591843e994ce061a92f7488be9 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 13:26:48 +0100 Subject: [PATCH 032/521] Rely on lerna version --- .github/workflows/tag-prerelease.yml | 6 +++++- versions/package.json | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 versions/package.json diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index e359269d2e..ff617089f1 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -38,4 +38,8 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - yarn lerna version prerelease --yes" + yarn lerna version prerelease --no-git-tag-version --force-publish --no-push --y + git add lerna.json + git commit -m 'Update version' + git push + git push --tags diff --git a/versions/package.json b/versions/package.json deleted file mode 100644 index 10299dc2b2..0000000000 --- a/versions/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "0.0.999-alpha.6", - "scripts": { - "postversion": "git push --tags && git push && echo \"Successfully pushed version and tag $npm_package_version!\"" - } -} From ebde64eee8456333eada97c96f7049cc6e0180f7 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 13:28:02 +0100 Subject: [PATCH 033/521] Remove yarn --- .github/workflows/tag-prerelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index ff617089f1..aef73338b4 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -38,7 +38,7 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - yarn lerna version prerelease --no-git-tag-version --force-publish --no-push --y + lerna version prerelease --no-git-tag-version --force-publish --no-push --y git add lerna.json git commit -m 'Update version' git push From 3837c5c8f4526e936224402482f413f7625c3abf Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 13:30:29 +0100 Subject: [PATCH 034/521] Tag --- .github/workflows/tag-prerelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index aef73338b4..b7b799c390 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -38,7 +38,7 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - lerna version prerelease --no-git-tag-version --force-publish --no-push --y + lerna version prerelease --force-publish --no-push --y git add lerna.json git commit -m 'Update version' git push From 7275600be9800f53feb2c9890a0a93e4f9b55f86 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 14:09:37 +0100 Subject: [PATCH 035/521] Bump lerna.json only --- .github/workflows/tag-prerelease.yml | 6 +----- scripts/bumpLernaVersion.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100755 scripts/bumpLernaVersion.sh diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index b7b799c390..0da00aa710 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -38,8 +38,4 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - lerna version prerelease --force-publish --no-push --y - git add lerna.json - git commit -m 'Update version' - git push - git push --tags + ./scripts/bumpLernaVersion.sh diff --git a/scripts/bumpLernaVersion.sh b/scripts/bumpLernaVersion.sh new file mode 100755 index 0000000000..30a8877dbf --- /dev/null +++ b/scripts/bumpLernaVersion.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Bump the version in lerna.json +CURRENT_VERSION=$(node -p "require('./lerna.json').version") +NEW_VERSION=$(echo $CURRENT_VERSION | awk -F. -v OFS=. '{++$NF; print}') +sed -i '' "s/\"version\": \"$CURRENT_VERSION\"/\"version\": \"$NEW_VERSION\"/" lerna.json + +lerna version prerelease --no-git-tag-version --force-publish --no-push --y +git add lerna.json +git commit -m "Bump version to $NEW_VERSION" +git tag $NEW_VERSION +git push +git push --tags + + From f4b8f932c4f99fb423f4ac2141bbf49a728d08ee Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 15:31:31 +0100 Subject: [PATCH 036/521] Add v prefix to tag --- scripts/bumpLernaVersion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bumpLernaVersion.sh b/scripts/bumpLernaVersion.sh index 30a8877dbf..0eb524780c 100755 --- a/scripts/bumpLernaVersion.sh +++ b/scripts/bumpLernaVersion.sh @@ -8,7 +8,7 @@ sed -i '' "s/\"version\": \"$CURRENT_VERSION\"/\"version\": \"$NEW_VERSION\"/" l lerna version prerelease --no-git-tag-version --force-publish --no-push --y git add lerna.json git commit -m "Bump version to $NEW_VERSION" -git tag $NEW_VERSION +git tag v$NEW_VERSION git push git push --tags From 2692f51ffac3176d3ec280149780ef92528624b3 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 15:44:31 +0100 Subject: [PATCH 037/521] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index bacbea4741..0fdf845200 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit bacbea4741e2a94f8a88960f9e7f15ba0e8cba42 +Subproject commit 0fdf845200f433418d80c28b1a3f06c1e0a836c8 From a70ebc9faf83faed63c9d55aad5f5c9529ef7c06 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 20 Apr 2023 15:56:01 +0100 Subject: [PATCH 038/521] Update tag-prerelease.yml --- .github/workflows/tag-prerelease.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 0da00aa710..06b82dac86 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -17,6 +17,7 @@ on: - "package.json" - "yarn.lock" workflow_dispatch: + jobs: tag-prerelease: From aa61dc6887c4e274b689c865a174257e6e808c12 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 16:31:20 +0100 Subject: [PATCH 039/521] Update versions --- .github/workflows/release-develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index d8db51ba44..f9d0410250 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -50,12 +50,12 @@ jobs: - run: yarn - name: Update versions run: | - version=$(cat versions/package.json \ + version=$(cat lerna.json \ | grep version \ | head -1 \ | awk -F: '{ print $2 }' \ | sed 's/[",]//g') - yarn lerna exec "yarn version --no-git-tag-version --new-version=$tag" + yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" - run: yarn bootstrap - run: yarn build - run: yarn build:sdk From fa3f65a0e5635ef3d6874c800220fad99651c27b Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 16:45:14 +0100 Subject: [PATCH 040/521] Fix fetching version --- .github/workflows/release-develop.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index f9d0410250..ecd2a0d050 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -53,8 +53,9 @@ jobs: version=$(cat lerna.json \ | grep version \ | head -1 \ - | awk -F: '{ print $2 }' \ + | awk -F: '{gsub(/"/,"",$2);gsub(/[[:space:]]*/,"",$2); print $2}' \ | sed 's/[",]//g') + echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" - run: yarn bootstrap - run: yarn build From bceeed390b376cd01658b13878747718ec2171e4 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 19:35:45 +0100 Subject: [PATCH 041/521] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 0fdf845200..e68c48e7c5 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 0fdf845200f433418d80c28b1a3f06c1e0a836c8 +Subproject commit e68c48e7c5740f2a9364319d47fc5b10fb4f2a7d From 8f6bf37496ec928857a2a31e6115f2e7138cd33a Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 19:58:48 +0100 Subject: [PATCH 042/521] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index e68c48e7c5..f70e747e06 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit e68c48e7c5740f2a9364319d47fc5b10fb4f2a7d +Subproject commit f70e747e0604d3c6c4bb66c2d8b37cf23275fc7b From 1ed1424d89b0c1b2875697a767c36d364f38484b Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 20:02:21 +0100 Subject: [PATCH 043/521] Use my user as git for testing --- .github/workflows/tag-prerelease.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 06b82dac86..b11a2e78ac 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -17,7 +17,6 @@ on: - "package.json" - "yarn.lock" workflow_dispatch: - jobs: tag-prerelease: @@ -37,6 +36,6 @@ jobs: - name: Tag prerelease run: | # setup the username and email. - git config --global user.name "Budibase Staging Release Bot" - git config --global user.email "<>" + git config --global user.name "adrinr" + git config --global user.email "adria@budibase.com" ./scripts/bumpLernaVersion.sh From 3b6b15c97e7e6fe621b35e97b4f1a6af1479326f Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 19:04:45 +0000 Subject: [PATCH 044/521] Bump version to 0.0.999-alpha.18 --- lerna.json | 1 - 1 file changed, 1 deletion(-) diff --git a/lerna.json b/lerna.json index bd0f708b01..adb1628bd7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,4 @@ { - "version": "2.5.6-alpha.19", "npmClient": "yarn", "version": "0.0.999-alpha.9", "packages": [ From 92115c5b956b256830f551b3df84f63595c6ab07 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 20:06:46 +0100 Subject: [PATCH 045/521] Remove latest references --- packages/backend-core/package.json | 1 - packages/bbui/package.json | 2 - packages/builder/package.json | 5 - packages/cli/package.json | 3 - packages/client/package.json | 5 - packages/frontend-core/package.json | 2 - packages/server/package.json | 6 - packages/shared-core/package.json | 3 - packages/worker/package.json | 4 - yarn.lock | 249 +--------------------------- 10 files changed, 2 insertions(+), 278 deletions(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b72805fb50..ac485694a6 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -22,7 +22,6 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "latest", "@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 4145ce44c0..f75ed7e701 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -38,8 +38,6 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", "@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 3c7d8abb7c..20ff9049a3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -58,11 +58,6 @@ } }, "dependencies": { - "@budibase/bbui": "latest", - "@budibase/client": "latest", - "@budibase/frontend-core": "latest", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", "@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 4a383237c0..8de23ec037 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -29,9 +29,6 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", "axios": "0.21.2", "download": "8.0.0", "find-free-port": "^2.0.0", diff --git a/packages/client/package.json b/packages/client/package.json index 15f1419a35..55558df45d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -19,11 +19,6 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "latest", - "@budibase/frontend-core": "latest", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", "@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 d6a1aaadf4..77a891ba01 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -6,8 +6,6 @@ "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "latest", - "@budibase/shared-core": "latest", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", "svelte": "^3.46.2" diff --git a/packages/server/package.json b/packages/server/package.json index 5a2681478d..9a8cc7fc54 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,12 +45,6 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "latest", - "@budibase/client": "latest", - "@budibase/pro": "latest", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", "@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 81f40a7b32..2b465f8f18 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -19,9 +19,6 @@ "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, - "dependencies": { - "@budibase/types": "latest" - }, "devDependencies": { "concurrently": "^7.6.0", "rimraf": "3.0.2", diff --git a/packages/worker/package.json b/packages/worker/package.json index ba825eb150..22c50fd977 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,10 +37,6 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "latest", - "@budibase/pro": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/yarn.lock b/yarn.lock index 307002fe06..651125dd3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,45 +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", "@budibase/backend-core@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5.tgz#d1ae36564de447674a157790b1e8ebff5f42748c" - integrity sha512-mGQSK6wc4M6+KVpfsbcfijjOJaWreGnd0muLFrUYsogliglWDXeCTfdEXFMkhCyKEe+3TWeVkxVKzss6zSG+Mw== - dependencies: - "@budibase/nano" "10.1.2" - "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.5" - "@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" - 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" @@ -1475,104 +1436,6 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/bbui@^2.5.5", "@budibase/bbui@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.5.5.tgz#860ab3f6cc1f8ada1f2cca1e8969e8390047800d" - integrity sha512-54kkCjOspcH25rybZ5+p1v6PfnyKouE7mQw73VFFh1AKSd+VORfLkMpwUm0w+Dsuoi1hBCA0k1eNLDY3md0+hg== - dependencies: - "@adobe/spectrum-css-workflow-icons" "1.2.1" - "@budibase/shared-core" "^2.5.5" - "@budibase/string-templates" "^2.5.5" - "@spectrum-css/accordion" "3.0.24" - "@spectrum-css/actionbutton" "1.0.1" - "@spectrum-css/actiongroup" "1.0.1" - "@spectrum-css/avatar" "3.0.2" - "@spectrum-css/button" "3.0.1" - "@spectrum-css/buttongroup" "3.0.2" - "@spectrum-css/checkbox" "3.0.2" - "@spectrum-css/dialog" "3.0.1" - "@spectrum-css/divider" "1.0.3" - "@spectrum-css/dropzone" "3.0.2" - "@spectrum-css/fieldgroup" "3.0.2" - "@spectrum-css/fieldlabel" "3.0.1" - "@spectrum-css/icon" "3.0.1" - "@spectrum-css/illustratedmessage" "3.0.2" - "@spectrum-css/inlinealert" "2.0.1" - "@spectrum-css/inputgroup" "3.0.2" - "@spectrum-css/label" "2.0.10" - "@spectrum-css/link" "3.1.1" - "@spectrum-css/menu" "3.0.1" - "@spectrum-css/modal" "3.0.1" - "@spectrum-css/pagination" "3.0.3" - "@spectrum-css/picker" "1.0.1" - "@spectrum-css/popover" "3.0.1" - "@spectrum-css/progressbar" "1.0.2" - "@spectrum-css/progresscircle" "1.0.2" - "@spectrum-css/radio" "3.0.2" - "@spectrum-css/search" "3.0.2" - "@spectrum-css/sidenav" "3.0.2" - "@spectrum-css/slider" "3.0.1" - "@spectrum-css/statuslight" "3.0.2" - "@spectrum-css/stepper" "3.0.3" - "@spectrum-css/switch" "1.0.2" - "@spectrum-css/table" "3.0.1" - "@spectrum-css/tabs" "3.2.12" - "@spectrum-css/tags" "3.0.2" - "@spectrum-css/textfield" "3.0.1" - "@spectrum-css/toast" "3.0.1" - "@spectrum-css/tooltip" "3.0.3" - "@spectrum-css/treeview" "3.0.2" - "@spectrum-css/typography" "3.0.1" - "@spectrum-css/underlay" "2.0.9" - "@spectrum-css/vars" "3.0.1" - dayjs "^1.10.4" - easymde "^2.16.1" - svelte-flatpickr "^3.2.3" - svelte-portal "^1.0.0" - -"@budibase/client@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.5.5.tgz#2647c34ab1ca50bcdd41bb48a3cd5afc8d53566a" - integrity sha512-PyyYTD8juGyGsQI2lyTymqIvBH3nflkuTv+XE1UrjVSrK5DJsW3e9/UiUWcDhOgX9Sq3Q3D8JMMGfSriwBEdLg== - dependencies: - "@budibase/bbui" "^2.5.5" - "@budibase/frontend-core" "^2.5.5" - "@budibase/shared-core" "^2.5.5" - "@budibase/string-templates" "^2.5.5" - "@budibase/types" "^2.5.5" - "@spectrum-css/button" "^3.0.3" - "@spectrum-css/card" "^3.0.3" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/link" "^3.1.3" - "@spectrum-css/page" "^3.0.1" - "@spectrum-css/tag" "^3.1.4" - "@spectrum-css/typography" "^3.0.2" - "@spectrum-css/vars" "^3.0.1" - apexcharts "^3.22.1" - dayjs "^1.10.5" - downloadjs "1.4.7" - html5-qrcode "^2.2.1" - leaflet "^1.7.1" - regexparam "^1.3.0" - sanitize-html "^2.7.0" - screenfull "^6.0.1" - shortid "^2.2.15" - socket.io-client "^4.5.1" - svelte "^3.49.0" - svelte-apexcharts "^1.0.2" - svelte-flatpickr "^3.1.0" - svelte-spa-router "^3.0.5" - -"@budibase/frontend-core@^2.5.5", "@budibase/frontend-core@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.5.5.tgz#58f81e95c849b12d39cab3b8ac64c1d6ee37952b" - integrity sha512-U1xRQIFxeGiRJREEft5E3VwbW0KSJNRAww3Jd9WGhKXZIWIiIruwW1jeyX0ISFdIJqtOVt0Vow9s9DKcoroMew== - dependencies: - "@budibase/bbui" "^2.5.5" - "@budibase/shared-core" "^2.5.5" - lodash "^4.17.21" - svelte "^3.46.2" - "@budibase/handlebars-helpers@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" @@ -1623,36 +1486,6 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5.tgz#8aa44b99baa8763d85f0ba3db92a178259dcf13e" - integrity sha512-dOUWWZGbFIumTfCQPmNSaTqlkLD6O/SK6H7IYY8FP67eMrLRZUanO3l0XgbjDiOdFIS1Hw5vvjHmunP0hQdLyw== - dependencies: - "@budibase/backend-core" "2.5.5" - "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.5" - "@koa/router" "8.0.8" - bull "4.10.1" - joi "17.6.0" - jsonwebtoken "8.5.1" - lru-cache "^7.14.1" - memorystream "^0.3.1" - node-fetch "^2.6.1" - -"@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/shared-core@^2.5.5", "@budibase/shared-core@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.5.tgz#8cd61edd27ad0e75f47a1cfaff724e5ad7f22844" - integrity sha512-JQZHqVsOntSg2LXxyGZLntn9jS83R77c9MklQ9zESDVcAqxMFVVc0UNpaaW+MaTkMWfbdPFqnZAYP30mkZGe2g== - dependencies: - "@budibase/types" "^2.5.5" - "@budibase/standard-components@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" @@ -1671,52 +1504,6 @@ 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== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - -"@budibase/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" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - -"@budibase/string-templates@^2.5.5", "@budibase/string-templates@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.5.tgz#2cd506ca6612319713ec6407279bcbf8a9bb9fb2" - integrity sha512-7OyMlndEh3r5obT6SoZGQvg5aq033U1DnYJAzumcAKY4T/9ATHBUAGbJeVD/lFXEj9KcEIfd2A8JPXjxkrDDeQ== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.15" - -"@budibase/types@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" - integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== - -"@budibase/types@2.5.5", "@budibase/types@^2.5.5", "@budibase/types@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5.tgz#aca40d7e160e400b9a814fbaa7ad04d10dcf9672" - integrity sha512-caKRxeCfnXzMFCc2lfDhKREl4VsDqnAnT55339NHQFTpDrTFboY0bG6h6osNan5CQCafNCLtS32bz597frGT9A== - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -7990,13 +7777,6 @@ cli-cursor@3.1.0, cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" -cli-progress@3.11.2: - version "3.11.2" - resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.11.2.tgz#f8c89bd157e74f3f2c43bcfb3505670b4d48fc77" - integrity sha512-lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA== - dependencies: - string-width "^4.2.3" - cli-spinners@2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" @@ -8286,11 +8066,6 @@ commander@6.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75" integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q== -commander@7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff" - integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg== - commander@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.0.tgz#71797971162cd3cf65f0b9d24eb28f8d303acdf1" @@ -9085,7 +8860,7 @@ dateformat@^4.5.1, dateformat@^4.6.3: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== -dayjs@^1.10.4, dayjs@^1.10.5, dayjs@^1.11.2, dayjs@^1.11.7: +dayjs@^1.10.4, dayjs@^1.10.5, dayjs@^1.11.2: version "1.11.7" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== @@ -9731,13 +9506,6 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -docker-compose@0.23.12: - version "0.23.12" - resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.12.tgz#fa883b98be08f6926143d06bf9e522ef7ed3210c" - integrity sha512-KFbSMqQBuHjTGZGmYDOCO0L4SaML3BsWTId5oSUyaBa22vALuFHNv+UdDWs3HcMylHWKsxCbLB7hnM/nCosWZw== - dependencies: - yaml "^1.10.2" - docker-compose@0.23.17: version "0.23.17" resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.17.tgz#8816bef82562d9417dc8c790aa4871350f93a2ba" @@ -24645,15 +24413,7 @@ vlq@^0.2.2: resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow== -vm2@3.9.17: - version "3.9.17" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" - integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== - dependencies: - acorn "^8.7.0" - acorn-walk "^8.2.0" - -vm2@^3.9.11, vm2@^3.9.15, vm2@^3.9.4: +vm2@3.9.16, vm2@^3.9.11, vm2@^3.9.15: version "3.9.16" resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.16.tgz#0fbc2a265f7bf8b837cea6f4a908f88a3f93b8e6" integrity sha512-3T9LscojNTxdOyG+e8gFeyBXkMlOBYDoF6dqZbj+MPVHi9x10UfiTAJIobuchRCp3QvC+inybTbMJIUrLsig0w== @@ -25506,8 +25266,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 f52a49091bde9296a30e2c6f747a94d295cc1e36 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 19:09:47 +0000 Subject: [PATCH 046/521] Bump version to 0.0.999-alpha.19 --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index f70e747e06..4f1832a13f 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit f70e747e0604d3c6c4bb66c2d8b37cf23275fc7b +Subproject commit 4f1832a13f1202194a76a52a37261dd96df9c0b1 From cc73606c71783a4b38ab24f15187da68c0569c46 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 20:15:03 +0100 Subject: [PATCH 047/521] Yarn after version updates --- .github/workflows/release-develop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index ecd2a0d050..f2ba306906 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -57,6 +57,7 @@ jobs: | sed 's/[",]//g') echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" + yarn - run: yarn bootstrap - run: yarn build - run: yarn build:sdk From ad547f32e22194cf0f7aca5fd688b9af6677577e Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 20:54:42 +0100 Subject: [PATCH 048/521] Add latest back --- packages/backend-core/package.json | 1 + packages/bbui/package.json | 2 + packages/builder/package.json | 5 + packages/cli/package.json | 3 + packages/client/package.json | 5 + packages/frontend-core/package.json | 2 + packages/server/package.json | 6 + packages/shared-core/package.json | 3 + packages/worker/package.json | 4 + yarn.lock | 202 ++++++++++++++++++++++++++++ 10 files changed, 233 insertions(+) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ac485694a6..b72805fb50 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -22,6 +22,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", + "@budibase/types": "latest", "@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 f75ed7e701..4145ce44c0 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -38,6 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", "@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 20ff9049a3..3c7d8abb7c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -58,6 +58,11 @@ } }, "dependencies": { + "@budibase/bbui": "latest", + "@budibase/client": "latest", + "@budibase/frontend-core": "latest", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", "@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 8de23ec037..4a383237c0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -29,6 +29,9 @@ "outputPath": "build" }, "dependencies": { + "@budibase/backend-core": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "axios": "0.21.2", "download": "8.0.0", "find-free-port": "^2.0.0", diff --git a/packages/client/package.json b/packages/client/package.json index 55558df45d..15f1419a35 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -19,6 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { + "@budibase/bbui": "latest", + "@budibase/frontend-core": "latest", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "@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 77a891ba01..d6a1aaadf4 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -6,6 +6,8 @@ "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { + "@budibase/bbui": "latest", + "@budibase/shared-core": "latest", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", "svelte": "^3.46.2" diff --git a/packages/server/package.json b/packages/server/package.json index 9a8cc7fc54..5a2681478d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,6 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", + "@budibase/backend-core": "latest", + "@budibase/client": "latest", + "@budibase/pro": "latest", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "@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 2b465f8f18..81f40a7b32 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -19,6 +19,9 @@ "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, + "dependencies": { + "@budibase/types": "latest" + }, "devDependencies": { "concurrently": "^7.6.0", "rimraf": "3.0.2", diff --git a/packages/worker/package.json b/packages/worker/package.json index 22c50fd977..ba825eb150 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,6 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { + "@budibase/backend-core": "latest", + "@budibase/pro": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/yarn.lock b/yarn.lock index 651125dd3b..1fee9f282e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,6 +1386,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/backend-core@2.5.6", "@budibase/backend-core@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6.tgz#c9dc047eac01088b9bd47abe1392080a2a041cfd" + integrity sha512-XwNhe7e+hzP/ejByXSKfOXbtxnfK7wThNhkSNMRQJ0NC78QdJyjRNTezDCW0TA+ILueNhG2zF5KW0Eazq1YWxA== + dependencies: + "@budibase/nano" "10.1.2" + "@budibase/pouchdb-replication-stream" "1.2.10" + "@budibase/types" "^2.5.6" + "@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" + 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" @@ -1436,6 +1475,104 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" +"@budibase/bbui@^2.5.6", "@budibase/bbui@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.5.6.tgz#dfbed35417a850ca92628324a47c5705db69308b" + integrity sha512-3J2b4sg1dJ08/XVbCC2PtAnAiyk9/f2PlCay6Lj3eu75+bvN877T/B/S8GsD9+SwQuEKRinhd3a4KiPDpqItkA== + dependencies: + "@adobe/spectrum-css-workflow-icons" "1.2.1" + "@budibase/shared-core" "^2.5.6" + "@budibase/string-templates" "^2.5.6" + "@spectrum-css/accordion" "3.0.24" + "@spectrum-css/actionbutton" "1.0.1" + "@spectrum-css/actiongroup" "1.0.1" + "@spectrum-css/avatar" "3.0.2" + "@spectrum-css/button" "3.0.1" + "@spectrum-css/buttongroup" "3.0.2" + "@spectrum-css/checkbox" "3.0.2" + "@spectrum-css/dialog" "3.0.1" + "@spectrum-css/divider" "1.0.3" + "@spectrum-css/dropzone" "3.0.2" + "@spectrum-css/fieldgroup" "3.0.2" + "@spectrum-css/fieldlabel" "3.0.1" + "@spectrum-css/icon" "3.0.1" + "@spectrum-css/illustratedmessage" "3.0.2" + "@spectrum-css/inlinealert" "2.0.1" + "@spectrum-css/inputgroup" "3.0.2" + "@spectrum-css/label" "2.0.10" + "@spectrum-css/link" "3.1.1" + "@spectrum-css/menu" "3.0.1" + "@spectrum-css/modal" "3.0.1" + "@spectrum-css/pagination" "3.0.3" + "@spectrum-css/picker" "1.0.1" + "@spectrum-css/popover" "3.0.1" + "@spectrum-css/progressbar" "1.0.2" + "@spectrum-css/progresscircle" "1.0.2" + "@spectrum-css/radio" "3.0.2" + "@spectrum-css/search" "3.0.2" + "@spectrum-css/sidenav" "3.0.2" + "@spectrum-css/slider" "3.0.1" + "@spectrum-css/statuslight" "3.0.2" + "@spectrum-css/stepper" "3.0.3" + "@spectrum-css/switch" "1.0.2" + "@spectrum-css/table" "3.0.1" + "@spectrum-css/tabs" "3.2.12" + "@spectrum-css/tags" "3.0.2" + "@spectrum-css/textfield" "3.0.1" + "@spectrum-css/toast" "3.0.1" + "@spectrum-css/tooltip" "3.0.3" + "@spectrum-css/treeview" "3.0.2" + "@spectrum-css/typography" "3.0.1" + "@spectrum-css/underlay" "2.0.9" + "@spectrum-css/vars" "3.0.1" + dayjs "^1.10.4" + easymde "^2.16.1" + svelte-flatpickr "^3.2.3" + svelte-portal "^1.0.0" + +"@budibase/client@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.5.6.tgz#91af2efacdec14e0d6af1db6d4aec1ff22819ac4" + integrity sha512-Yu/gs88fGi54GlPeVS/IO+cDicMUBT8+W/4YaUgfUOcxeqJDGPAkLNMLh2HlQ57x765V/PmRda1BAgDF3h5hkQ== + dependencies: + "@budibase/bbui" "^2.5.6" + "@budibase/frontend-core" "^2.5.6" + "@budibase/shared-core" "^2.5.6" + "@budibase/string-templates" "^2.5.6" + "@budibase/types" "^2.5.6" + "@spectrum-css/button" "^3.0.3" + "@spectrum-css/card" "^3.0.3" + "@spectrum-css/divider" "^1.0.3" + "@spectrum-css/link" "^3.1.3" + "@spectrum-css/page" "^3.0.1" + "@spectrum-css/tag" "^3.1.4" + "@spectrum-css/typography" "^3.0.2" + "@spectrum-css/vars" "^3.0.1" + apexcharts "^3.22.1" + dayjs "^1.10.5" + downloadjs "1.4.7" + html5-qrcode "^2.2.1" + leaflet "^1.7.1" + regexparam "^1.3.0" + sanitize-html "^2.7.0" + screenfull "^6.0.1" + shortid "^2.2.15" + socket.io-client "^4.5.1" + svelte "^3.49.0" + svelte-apexcharts "^1.0.2" + svelte-flatpickr "^3.1.0" + svelte-spa-router "^3.0.5" + +"@budibase/frontend-core@^2.5.6", "@budibase/frontend-core@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.5.6.tgz#92ec20c006488cce4452f8af2cb65804026ec51e" + integrity sha512-/IbT5m7xv+aqZfTpxJFCtx3ZaA5xeM66OHe3AXa9HlKKWEU1jAEKolaTrC+Qmfhp0pwFSyYsP/U9RBZpFY/r9A== + dependencies: + "@budibase/bbui" "^2.5.6" + "@budibase/shared-core" "^2.5.6" + lodash "^4.17.21" + svelte "^3.46.2" + "@budibase/handlebars-helpers@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" @@ -1486,6 +1623,29 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" +"@budibase/pro@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6.tgz#6f7311b67c2f4928f0885e91694310abcf8786b0" + integrity sha512-VTBcmazP5Bi2LukCnzZKmtDrw0zwa7TViB0oJKPKp6QIJP74VT+wSyLOk9OPqwtlAHAPeBfkE+mBdvF5vvj7TA== + dependencies: + "@budibase/backend-core" "2.5.6" + "@budibase/string-templates" "2.3.20" + "@budibase/types" "2.5.6" + "@koa/router" "8.0.8" + bull "4.10.1" + joi "17.6.0" + jsonwebtoken "8.5.1" + lru-cache "^7.14.1" + memorystream "^0.3.1" + node-fetch "^2.6.1" + +"@budibase/shared-core@^2.5.6", "@budibase/shared-core@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.6.tgz#f3960a39d66a4e016399cc641d54c318cf09ae8f" + integrity sha512-5+oJjpylG8YzO922Nidw1fOsxRhE0gK05FSO/DMYrEDhi6rDiLCQhBaPc+83MAnJi5Yec6Sffpd3gikSVdyMDA== + dependencies: + "@budibase/types" "^2.5.6" + "@budibase/standard-components@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" @@ -1504,6 +1664,35 @@ 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== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.4" + +"@budibase/string-templates@^2.5.6", "@budibase/string-templates@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.6.tgz#d811ce82e99f57360669c0842187e0dc32bd31f1" + integrity sha512-dpKR8yexXuvcjHQzwGdRKauf+hmhS8gmpdo/FJbdrCBhJpEVJIQLn5O/3bXvMHwV7URuJ/H2AzTVybbt8Ob5gw== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.15" + +"@budibase/types@2.5.6", "@budibase/types@^2.5.6", "@budibase/types@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6.tgz#b52566ebe54de5b515b4fc6eabfd6f279202fce1" + integrity sha512-WQVCcYJhj0hexi7BsayOgwpOC3AaMsA7azD4PjpifzaK0Ez+U2NzAT7oEZM9TL8aG8p4BvnTaAxP/Q9KRTdeRA== + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -24421,6 +24610,14 @@ vm2@3.9.16, vm2@^3.9.11, vm2@^3.9.15: acorn "^8.7.0" acorn-walk "^8.2.0" +vm2@^3.9.4: + version "3.9.17" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" + integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.0" + vuvuzela@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" @@ -25266,3 +25463,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 9387d37d3beb10b2ea5ef1bbb7ec25bc048f2065 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 22:51:28 +0100 Subject: [PATCH 049/521] Use 0.0.1 --- .github/workflows/release-develop.yml | 1 + packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 +- packages/builder/package.json | 10 +- packages/cli/package.json | 6 +- packages/client/package.json | 10 +- packages/frontend-core/package.json | 4 +- packages/server/package.json | 12 +- packages/shared-core/package.json | 2 +- packages/worker/package.json | 8 +- yarn.lock | 202 -------------------------- 11 files changed, 30 insertions(+), 231 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index f2ba306906..451062fdf1 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -58,6 +58,7 @@ jobs: echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" yarn + node scripts/updateVersions.js $version - run: yarn bootstrap - run: yarn build - run: yarn build:sdk diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b72805fb50..c603c9e033 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -22,7 +22,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "latest", + "@budibase/types": "0.0.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 4145ce44c0..f313dd04c0 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", + "@budibase/shared-core": "0.0.1", + "@budibase/string-templates": "0.0.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 3c7d8abb7c..857ef21d47 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "latest", - "@budibase/client": "latest", - "@budibase/frontend-core": "latest", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", + "@budibase/bbui": "0.0.1", + "@budibase/client": "0.0.1", + "@budibase/frontend-core": "0.0.1", + "@budibase/shared-core": "0.0.1", + "@budibase/string-templates": "0.0.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 4a383237c0..21713fba2a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", + "@budibase/backend-core": "0.0.1", + "@budibase/string-templates": "0.0.1", + "@budibase/types": "0.0.1", "axios": "0.21.2", "download": "8.0.0", "find-free-port": "^2.0.0", diff --git a/packages/client/package.json b/packages/client/package.json index 15f1419a35..6a7b0de225 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "latest", - "@budibase/frontend-core": "latest", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", + "@budibase/bbui": "0.0.1", + "@budibase/frontend-core": "0.0.1", + "@budibase/shared-core": "0.0.1", + "@budibase/string-templates": "0.0.1", + "@budibase/types": "0.0.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 d6a1aaadf4..3a8a7bc9f6 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -6,8 +6,8 @@ "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "latest", - "@budibase/shared-core": "latest", + "@budibase/bbui": "0.0.1", + "@budibase/shared-core": "0.0.1", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", "svelte": "^3.46.2" diff --git a/packages/server/package.json b/packages/server/package.json index 5a2681478d..f0ece87bed 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "latest", - "@budibase/client": "latest", - "@budibase/pro": "latest", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", + "@budibase/backend-core": "0.0.1", + "@budibase/client": "0.0.1", + "@budibase/pro": "0.0.1", + "@budibase/shared-core": "0.0.1", + "@budibase/string-templates": "0.0.1", + "@budibase/types": "0.0.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 81f40a7b32..0bc643f551 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -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": "latest" + "@budibase/types": "0.0.1" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index ba825eb150..d3bc7e3b13 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "latest", - "@budibase/pro": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", + "@budibase/backend-core": "0.0.1", + "@budibase/pro": "0.0.1", + "@budibase/string-templates": "0.0.1", + "@budibase/types": "0.0.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/yarn.lock b/yarn.lock index 1fee9f282e..651125dd3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,45 +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.6", "@budibase/backend-core@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6.tgz#c9dc047eac01088b9bd47abe1392080a2a041cfd" - integrity sha512-XwNhe7e+hzP/ejByXSKfOXbtxnfK7wThNhkSNMRQJ0NC78QdJyjRNTezDCW0TA+ILueNhG2zF5KW0Eazq1YWxA== - dependencies: - "@budibase/nano" "10.1.2" - "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.6" - "@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" - 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" @@ -1475,104 +1436,6 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/bbui@^2.5.6", "@budibase/bbui@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.5.6.tgz#dfbed35417a850ca92628324a47c5705db69308b" - integrity sha512-3J2b4sg1dJ08/XVbCC2PtAnAiyk9/f2PlCay6Lj3eu75+bvN877T/B/S8GsD9+SwQuEKRinhd3a4KiPDpqItkA== - dependencies: - "@adobe/spectrum-css-workflow-icons" "1.2.1" - "@budibase/shared-core" "^2.5.6" - "@budibase/string-templates" "^2.5.6" - "@spectrum-css/accordion" "3.0.24" - "@spectrum-css/actionbutton" "1.0.1" - "@spectrum-css/actiongroup" "1.0.1" - "@spectrum-css/avatar" "3.0.2" - "@spectrum-css/button" "3.0.1" - "@spectrum-css/buttongroup" "3.0.2" - "@spectrum-css/checkbox" "3.0.2" - "@spectrum-css/dialog" "3.0.1" - "@spectrum-css/divider" "1.0.3" - "@spectrum-css/dropzone" "3.0.2" - "@spectrum-css/fieldgroup" "3.0.2" - "@spectrum-css/fieldlabel" "3.0.1" - "@spectrum-css/icon" "3.0.1" - "@spectrum-css/illustratedmessage" "3.0.2" - "@spectrum-css/inlinealert" "2.0.1" - "@spectrum-css/inputgroup" "3.0.2" - "@spectrum-css/label" "2.0.10" - "@spectrum-css/link" "3.1.1" - "@spectrum-css/menu" "3.0.1" - "@spectrum-css/modal" "3.0.1" - "@spectrum-css/pagination" "3.0.3" - "@spectrum-css/picker" "1.0.1" - "@spectrum-css/popover" "3.0.1" - "@spectrum-css/progressbar" "1.0.2" - "@spectrum-css/progresscircle" "1.0.2" - "@spectrum-css/radio" "3.0.2" - "@spectrum-css/search" "3.0.2" - "@spectrum-css/sidenav" "3.0.2" - "@spectrum-css/slider" "3.0.1" - "@spectrum-css/statuslight" "3.0.2" - "@spectrum-css/stepper" "3.0.3" - "@spectrum-css/switch" "1.0.2" - "@spectrum-css/table" "3.0.1" - "@spectrum-css/tabs" "3.2.12" - "@spectrum-css/tags" "3.0.2" - "@spectrum-css/textfield" "3.0.1" - "@spectrum-css/toast" "3.0.1" - "@spectrum-css/tooltip" "3.0.3" - "@spectrum-css/treeview" "3.0.2" - "@spectrum-css/typography" "3.0.1" - "@spectrum-css/underlay" "2.0.9" - "@spectrum-css/vars" "3.0.1" - dayjs "^1.10.4" - easymde "^2.16.1" - svelte-flatpickr "^3.2.3" - svelte-portal "^1.0.0" - -"@budibase/client@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.5.6.tgz#91af2efacdec14e0d6af1db6d4aec1ff22819ac4" - integrity sha512-Yu/gs88fGi54GlPeVS/IO+cDicMUBT8+W/4YaUgfUOcxeqJDGPAkLNMLh2HlQ57x765V/PmRda1BAgDF3h5hkQ== - dependencies: - "@budibase/bbui" "^2.5.6" - "@budibase/frontend-core" "^2.5.6" - "@budibase/shared-core" "^2.5.6" - "@budibase/string-templates" "^2.5.6" - "@budibase/types" "^2.5.6" - "@spectrum-css/button" "^3.0.3" - "@spectrum-css/card" "^3.0.3" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/link" "^3.1.3" - "@spectrum-css/page" "^3.0.1" - "@spectrum-css/tag" "^3.1.4" - "@spectrum-css/typography" "^3.0.2" - "@spectrum-css/vars" "^3.0.1" - apexcharts "^3.22.1" - dayjs "^1.10.5" - downloadjs "1.4.7" - html5-qrcode "^2.2.1" - leaflet "^1.7.1" - regexparam "^1.3.0" - sanitize-html "^2.7.0" - screenfull "^6.0.1" - shortid "^2.2.15" - socket.io-client "^4.5.1" - svelte "^3.49.0" - svelte-apexcharts "^1.0.2" - svelte-flatpickr "^3.1.0" - svelte-spa-router "^3.0.5" - -"@budibase/frontend-core@^2.5.6", "@budibase/frontend-core@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.5.6.tgz#92ec20c006488cce4452f8af2cb65804026ec51e" - integrity sha512-/IbT5m7xv+aqZfTpxJFCtx3ZaA5xeM66OHe3AXa9HlKKWEU1jAEKolaTrC+Qmfhp0pwFSyYsP/U9RBZpFY/r9A== - dependencies: - "@budibase/bbui" "^2.5.6" - "@budibase/shared-core" "^2.5.6" - lodash "^4.17.21" - svelte "^3.46.2" - "@budibase/handlebars-helpers@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" @@ -1623,29 +1486,6 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6.tgz#6f7311b67c2f4928f0885e91694310abcf8786b0" - integrity sha512-VTBcmazP5Bi2LukCnzZKmtDrw0zwa7TViB0oJKPKp6QIJP74VT+wSyLOk9OPqwtlAHAPeBfkE+mBdvF5vvj7TA== - dependencies: - "@budibase/backend-core" "2.5.6" - "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.6" - "@koa/router" "8.0.8" - bull "4.10.1" - joi "17.6.0" - jsonwebtoken "8.5.1" - lru-cache "^7.14.1" - memorystream "^0.3.1" - node-fetch "^2.6.1" - -"@budibase/shared-core@^2.5.6", "@budibase/shared-core@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.6.tgz#f3960a39d66a4e016399cc641d54c318cf09ae8f" - integrity sha512-5+oJjpylG8YzO922Nidw1fOsxRhE0gK05FSO/DMYrEDhi6rDiLCQhBaPc+83MAnJi5Yec6Sffpd3gikSVdyMDA== - dependencies: - "@budibase/types" "^2.5.6" - "@budibase/standard-components@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" @@ -1664,35 +1504,6 @@ 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== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - -"@budibase/string-templates@^2.5.6", "@budibase/string-templates@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.6.tgz#d811ce82e99f57360669c0842187e0dc32bd31f1" - integrity sha512-dpKR8yexXuvcjHQzwGdRKauf+hmhS8gmpdo/FJbdrCBhJpEVJIQLn5O/3bXvMHwV7URuJ/H2AzTVybbt8Ob5gw== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.15" - -"@budibase/types@2.5.6", "@budibase/types@^2.5.6", "@budibase/types@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6.tgz#b52566ebe54de5b515b4fc6eabfd6f279202fce1" - integrity sha512-WQVCcYJhj0hexi7BsayOgwpOC3AaMsA7azD4PjpifzaK0Ez+U2NzAT7oEZM9TL8aG8p4BvnTaAxP/Q9KRTdeRA== - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -24610,14 +24421,6 @@ vm2@3.9.16, vm2@^3.9.11, vm2@^3.9.15: acorn "^8.7.0" acorn-walk "^8.2.0" -vm2@^3.9.4: - version "3.9.17" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" - integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== - dependencies: - acorn "^8.7.0" - acorn-walk "^8.2.0" - vuvuzela@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" @@ -25463,8 +25266,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 93179855a7410664b0609b237f6b635a135e9cae Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 22:53:36 +0100 Subject: [PATCH 050/521] Update version script --- scripts/updateVersions.js | 53 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100755 scripts/updateVersions.js diff --git a/scripts/updateVersions.js b/scripts/updateVersions.js new file mode 100755 index 0000000000..d7bc8643bb --- /dev/null +++ b/scripts/updateVersions.js @@ -0,0 +1,53 @@ +const fs = require("fs") +const path = require("path") +const { execSync } = require("child_process") + +// Get the version argument from the command line +const version = process.argv[2] +if (!version) { + console.error("Usage: node update-workspace-dependencies.js ") + process.exit(1) +} + +// Get the list of workspaces with mismatched dependencies +const output = execSync("yarn --silent workspaces info --json", { + encoding: "utf-8", +}) +const data = JSON.parse(output) + +const workspaces = Object.keys(data).filter(key => { + return data[key].mismatchedWorkspaceDependencies?.length +}) + +// Loop through each workspace and update the dependencies +workspaces.forEach(workspace => { + const dependencies = data[workspace].mismatchedWorkspaceDependencies + + // Loop through each dependency and update its version in package.json + const packageJsonPath = path.join(data[workspace].location, "package.json") + const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8")) + let hasChanges = false + + dependencies.forEach(dependency => { + if (packageJson.dependencies?.[dependency]) { + packageJson.dependencies[dependency] = version + hasChanges = true + } + if (packageJson.devDependencies?.[dependency]) { + packageJson.devDependencies[dependency] = version + hasChanges = true + } + if (packageJson.peerDependencies?.[dependency]) { + packageJson.peerDependencies[dependency] = version + hasChanges = true + } + }) + + // Write changes to package.json if there are any + if (hasChanges) { + fs.writeFileSync( + packageJsonPath, + JSON.stringify(packageJson, null, 2) + "\n" + ) + } +}) From dd9d499cc1d9bb0b7af22c2476d1550b0a7892d2 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 22:54:59 +0100 Subject: [PATCH 051/521] Use latest for pro --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index f0ece87bed..04a7eabb7e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "0.0.1", "@budibase/client": "0.0.1", - "@budibase/pro": "0.0.1", + "@budibase/pro": "latest", "@budibase/shared-core": "0.0.1", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index d3bc7e3b13..768acf52ee 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "0.0.1", - "@budibase/pro": "0.0.1", + "@budibase/pro": "latest", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", "@koa/router": "8.0.8", From 5e844ac6dbde93620547d3d678da1d3aa3c3ec82 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 22:57:11 +0100 Subject: [PATCH 052/521] Run yarn after changing versions --- .github/workflows/release-develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 451062fdf1..2ec5f2b6c2 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -57,8 +57,8 @@ jobs: | sed 's/[",]//g') echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" - yarn node scripts/updateVersions.js $version + yarn - run: yarn bootstrap - run: yarn build - run: yarn build:sdk From d6ea99689fa8439536f635ae12da57c2cfb7d6c5 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 23:12:12 +0100 Subject: [PATCH 053/521] Publish packages --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f8bb7113c..a14be1a01b 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "npm publish", + "release:develop": "yarn lerna exec 'npm publish'", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From 49713e5f9a441b8ec903141050c82412df2bee12 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 23:31:46 +0100 Subject: [PATCH 054/521] Don't publish sdk --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a14be1a01b..822de21725 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "yarn lerna exec 'npm publish'", + "release:develop": "yarn lerna exec 'npm publish' --ignore=@budibase/sdk", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From d8103046e2c8f522535fd2d566f9a9461be38441 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 23:48:48 +0100 Subject: [PATCH 055/521] Publish via lerna, from package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 822de21725..ae4c5fff51 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "yarn lerna exec 'npm publish' --ignore=@budibase/sdk", + "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From 59aefecdd42a7aee8fd9d52106c6ff7ce3f85bb8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 08:43:22 +0100 Subject: [PATCH 056/521] Reset git before publish --- .github/workflows/release-develop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 2ec5f2b6c2..773f892715 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -70,6 +70,7 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" + git reset --hard echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop From 7591ab3428ef61c61e9e51ca5d729ae57d5f9af8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 09:03:25 +0100 Subject: [PATCH 057/521] Remove paths on workflow --- .github/workflows/release-develop.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 773f892715..3a0b759d63 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -5,16 +5,6 @@ on: push: tags: - v*-alpha.* - paths: - - ".aws/**" - - ".github/**" - - "charts/**" - - "packages/**" - - "scripts/**" - - "package.json" - - "yarn.lock" - - "package.json" - - "yarn.lock" workflow_dispatch: env: From acc79f9363ae0d725e2b545ce2dcae1ec35bdc87 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 09:22:59 +0100 Subject: [PATCH 058/521] Clean submodules --- .github/workflows/release-develop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 3a0b759d63..294d048db0 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -61,6 +61,7 @@ jobs: git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" git reset --hard + git submodule foreach git reset --hard echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop From 417b7b15381086c41603bcb3bd067e466a0ebea9 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 09:53:24 +0100 Subject: [PATCH 059/521] Bump version manually --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ae4c5fff51..725911d931 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact", + "release:develop": "lerna publish from-package --yes --force-publish --exact", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From f9028e1a3f5ef6f2ebbbd493268a988acaed9034 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:01:41 +0100 Subject: [PATCH 060/521] Commit instead of reseting --- .github/workflows/release-develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 294d048db0..979e9ff147 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -60,8 +60,8 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - git reset --hard - git submodule foreach git reset --hard + git submodule foreach git add . && git commit -m 'release process' + git add . && git commit -m 'release process' echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop From c96c5350d62e44f4ac26b89f71dd650da73c8c8c Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:19:54 +0100 Subject: [PATCH 061/521] Commit all --- .github/workflows/release-develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 979e9ff147..697647380d 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -60,8 +60,8 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - git submodule foreach git add . && git commit -m 'release process' - git add . && git commit -m 'release process' + git submodule foreach git commit -a -m 'release process' + git commit -a -m 'release process' echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop From 9cbc90e7247e3408de97dd90499b9112c69bcdc1 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:28:39 +0100 Subject: [PATCH 062/521] Trigger --- .github/workflows/tag-prerelease.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index b11a2e78ac..102787eb0d 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -16,6 +16,7 @@ on: - "yarn.lock" - "package.json" - "yarn.lock" + - "lerna.json" workflow_dispatch: jobs: From d05938597935674f00f4df76a6b5b3773941873c Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:46:49 +0100 Subject: [PATCH 063/521] Add no-push --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 725911d931..2bc4bc6e31 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "lerna publish from-package --yes --force-publish --exact", + "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From 7018fea06f9646dd79fc9f708a5c0e7c65a8acf5 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 11:00:25 +0100 Subject: [PATCH 064/521] Add logging --- .github/workflows/release-develop.yml | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 697647380d..cb098cb3c9 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -64,6 +64,7 @@ jobs: git commit -a -m 'release process' echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop + echo 'Done' - name: Build/release Docker images run: | diff --git a/package.json b/package.json index 2bc4bc6e31..c0a2c41774 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push", + "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --loglevel silly", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From a492455b28ea482f8759feb811c5e59ac6635b1b Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:01:48 +0000 Subject: [PATCH 065/521] Bump version to 0.0.999-alpha.33 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index adb1628bd7..40d522d652 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { + "version": "0.0.999-alpha.33", "npmClient": "yarn", - "version": "0.0.999-alpha.9", "packages": [ "packages/backend-core", "packages/bbui", From d8cfb68082f0aae69f9e3b6eae0badcf9f1801b1 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 11:14:08 +0100 Subject: [PATCH 066/521] --no-git-reset --- .github/workflows/tag-prerelease.yml | 2 -- package.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 102787eb0d..d4efb92159 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -14,8 +14,6 @@ on: - "scripts/**" - "package.json" - "yarn.lock" - - "package.json" - - "yarn.lock" - "lerna.json" workflow_dispatch: diff --git a/package.json b/package.json index c0a2c41774..5f42e87ec7 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --loglevel silly", + "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --loglevel silly --no-git-reset", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From db6e25cbf1d8ebc099d56093a04ff8f8e79eb8bc Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:14:47 +0000 Subject: [PATCH 067/521] Bump version to 0.0.999-alpha.34 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 40d522d652..9fd9387824 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.0.999-alpha.33", + "version": "0.0.999-alpha.34", "npmClient": "yarn", "packages": [ "packages/backend-core", From b0407c519fcc1e6e947c40e9704c4f3665ae4641 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:15:05 +0000 Subject: [PATCH 068/521] Bump version to 0.0.999-alpha.35 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 9fd9387824..4e480fe1f4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.0.999-alpha.34", + "version": "0.0.999-alpha.35", "npmClient": "yarn", "packages": [ "packages/backend-core", From a2746ec2416a38b6f8c15f9f985dd082ec61dc52 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 11:36:07 +0100 Subject: [PATCH 069/521] Cleanups --- .github/workflows/tag-prerelease.yml | 5 ++--- package.json | 2 +- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index d4efb92159..4f24f6983d 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -14,7 +14,6 @@ on: - "scripts/**" - "package.json" - "yarn.lock" - - "lerna.json" workflow_dispatch: jobs: @@ -35,6 +34,6 @@ jobs: - name: Tag prerelease run: | # setup the username and email. - git config --global user.name "adrinr" - git config --global user.email "adria@budibase.com" + git config --global user.name "Budibase Staging Release Bot" + git config --global user.email "<>" ./scripts/bumpLernaVersion.sh diff --git a/package.json b/package.json index 5f42e87ec7..1e2fea88f3 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --loglevel silly --no-git-reset", + "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --no-git-reset", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", diff --git a/packages/server/package.json b/packages/server/package.json index 04a7eabb7e..96bdf5ed88 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "0.0.1", "@budibase/client": "0.0.1", - "@budibase/pro": "latest", + "@budibase/pro": "develop", "@budibase/shared-core": "0.0.1", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index 768acf52ee..334c4ff1e8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "0.0.1", - "@budibase/pro": "latest", + "@budibase/pro": "develop", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", "@koa/router": "8.0.8", From c5e6158329604d0d13f0a0ee2bcb5820c1b06c7e Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 11:42:49 +0100 Subject: [PATCH 070/521] Remove pull --- .github/workflows/release-develop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index cb098cb3c9..aff1f3158e 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -91,7 +91,6 @@ jobs: git config user.name "Budibase Helm Bot" git config user.email "<>" git reset --hard - git pull mkdir sync echo "Packaging chart to sync dir" helm package charts/budibase --version 0.0.0-develop --app-version develop --destination sync From 2735f1bfc60ef7990607cd0e85bbf82f74294b93 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 12:01:33 +0100 Subject: [PATCH 071/521] Try fetching --- .github/workflows/release-develop.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index aff1f3158e..8cecc5f3d9 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -6,6 +6,11 @@ on: tags: - v*-alpha.* workflow_dispatch: + inputs: + tags: + description: "Release tag" + required: true + type: boolean env: # Posthog token used by ui at build time @@ -91,6 +96,7 @@ jobs: git config user.name "Budibase Helm Bot" git config user.email "<>" git reset --hard + git fetch mkdir sync echo "Packaging chart to sync dir" helm package charts/budibase --version 0.0.0-develop --app-version develop --destination sync From 7e271fed18b70b177dea4abc45d3b845b24b30c9 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 14:11:21 +0100 Subject: [PATCH 072/521] Bump version via node script --- .github/workflows/tag-prerelease.yml | 2 +- scripts/bumpLernaVersion.sh | 15 ---------- scripts/bumpVersion.js | 43 ++++++++++++++++++++++++++++ scripts/versionCommit.sh | 18 ++++++++++++ 4 files changed, 62 insertions(+), 16 deletions(-) delete mode 100755 scripts/bumpLernaVersion.sh create mode 100644 scripts/bumpVersion.js create mode 100755 scripts/versionCommit.sh diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 4f24f6983d..7911b76ad4 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -36,4 +36,4 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - ./scripts/bumpLernaVersion.sh + ./scripts/versionCommit.sh alpha diff --git a/scripts/bumpLernaVersion.sh b/scripts/bumpLernaVersion.sh deleted file mode 100755 index 0eb524780c..0000000000 --- a/scripts/bumpLernaVersion.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# Bump the version in lerna.json -CURRENT_VERSION=$(node -p "require('./lerna.json').version") -NEW_VERSION=$(echo $CURRENT_VERSION | awk -F. -v OFS=. '{++$NF; print}') -sed -i '' "s/\"version\": \"$CURRENT_VERSION\"/\"version\": \"$NEW_VERSION\"/" lerna.json - -lerna version prerelease --no-git-tag-version --force-publish --no-push --y -git add lerna.json -git commit -m "Bump version to $NEW_VERSION" -git tag v$NEW_VERSION -git push -git push --tags - - diff --git a/scripts/bumpVersion.js b/scripts/bumpVersion.js new file mode 100644 index 0000000000..6853ee1338 --- /dev/null +++ b/scripts/bumpVersion.js @@ -0,0 +1,43 @@ +const fs = require("fs") + +const filePath = "lerna.json" +const versionBump = process.argv[2] || "patch" + +// Read and parse lerna.json file +const fileData = fs.readFileSync(filePath) +const lernaData = JSON.parse(fileData) + +// Get current version and split into major, minor, patch, and alpha components +const currentVersion = lernaData.version +const [versionWithoutPrerelease, prerelease] = currentVersion.split("-") +const [major, minor, patch] = versionWithoutPrerelease.split(".").map(Number) + +// Calculate new version based on specified version bump +let newVersion = currentVersion +switch (versionBump) { + case "major": + newVersion = `${major + 1}.0.0` + break + case "minor": + newVersion = `${major}.${minor + 1}.0` + break + case "patch": + newVersion = `${major}.${minor}.${patch + 1}` + break + case "alpha": + const newPrerelease = (prerelease || -1) + 1 + newVersion = prerelease + ? `${versionWithoutPrerelease}-alpha.${newPrerelease}` + : `${major}.${minor}.${patch}-alpha.${newPrerelease}` + break + default: + console.error(`Invalid version bump '${versionBump}' specified.`) + process.exit(1) +} + +// Update lerna.json file with new version +lernaData.version = newVersion +const updatedData = JSON.stringify(lernaData, null, 2) +fs.writeFileSync(filePath, updatedData) + +console.log(`Updated version from ${currentVersion} to ${newVersion}`) diff --git a/scripts/versionCommit.sh b/scripts/versionCommit.sh new file mode 100755 index 0000000000..4145d02782 --- /dev/null +++ b/scripts/versionCommit.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +if [ -z "$1" ] +then + echo "Error: version number is required. Usage: $0 [major|minor|patch|alpha]" + exit 1 +fi + +# Bump the version in lerna.json +node scripts/bumpVersion.js $1 + +git add lerna.json +git commit -m "Bump version to $NEW_VERSION" +git tag v$NEW_VERSION +git push +git push --tags + + From eaab3dfc460d40eee5bba61fa718a6e1ff40916e Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 14:25:36 +0100 Subject: [PATCH 073/521] Fix patching --- lerna.json | 2 +- scripts/bumpVersion.js | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lerna.json b/lerna.json index 4e480fe1f4..f8edafa311 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.0.999-alpha.35", + "version": "0.0.999-alpha.38", "npmClient": "yarn", "packages": [ "packages/backend-core", diff --git a/scripts/bumpVersion.js b/scripts/bumpVersion.js index 6853ee1338..7f68b44fc6 100644 --- a/scripts/bumpVersion.js +++ b/scripts/bumpVersion.js @@ -9,7 +9,7 @@ const lernaData = JSON.parse(fileData) // Get current version and split into major, minor, patch, and alpha components const currentVersion = lernaData.version -const [versionWithoutPrerelease, prerelease] = currentVersion.split("-") +const [versionWithoutPrerelease, alpha] = currentVersion.split("-") const [major, minor, patch] = versionWithoutPrerelease.split(".").map(Number) // Calculate new version based on specified version bump @@ -25,10 +25,13 @@ switch (versionBump) { newVersion = `${major}.${minor}.${patch + 1}` break case "alpha": - const newPrerelease = (prerelease || -1) + 1 - newVersion = prerelease - ? `${versionWithoutPrerelease}-alpha.${newPrerelease}` - : `${major}.${minor}.${patch}-alpha.${newPrerelease}` + let newAlphaVersion = 0 + if (alpha) { + const [_, alphaVersion] = alpha.split(".") + newAlphaVersion = +alphaVersion + 1 + } + newVersion = `${versionWithoutPrerelease}-alpha.${newAlphaVersion}` + break default: console.error(`Invalid version bump '${versionBump}' specified.`) From f52fc90dbcafeba1eb81697e11b11064ee9b98da Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 16:45:36 +0100 Subject: [PATCH 074/521] Fix --- scripts/versionCommit.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/versionCommit.sh b/scripts/versionCommit.sh index 4145d02782..b7f08ec18f 100755 --- a/scripts/versionCommit.sh +++ b/scripts/versionCommit.sh @@ -9,10 +9,10 @@ fi # Bump the version in lerna.json node scripts/bumpVersion.js $1 + +NEW_VERSION=$(node -p "require('./lerna.json').version") git add lerna.json git commit -m "Bump version to $NEW_VERSION" git tag v$NEW_VERSION git push -git push --tags - - +git push --tags \ No newline at end of file From 410046cae21eb94b0a553e6c12ae60fe71cf3ccc Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 16:48:01 +0100 Subject: [PATCH 075/521] Run tag only on develop --- .github/workflows/tag-prerelease.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 7911b76ad4..54ce6dd547 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -5,7 +5,6 @@ on: push: branches: - develop - - chore/pipeline_npm_version_updates paths: - ".aws/**" - ".github/**" @@ -21,11 +20,11 @@ jobs: runs-on: ubuntu-latest steps: - # - name: Fail if branch is not develop - # if: github.ref != 'refs/heads/develop' - # run: | - # echo "Ref is not develop, you must run this job from develop." - # exit 1 + - name: Fail if branch is not develop + if: github.ref != 'refs/heads/develop' + run: | + echo "Ref is not develop, you must run this job from develop." + exit 1 - uses: actions/checkout@v2 with: submodules: true From 29ed6bf10ba2e51ced6357a8ab9340c07b5cf629 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 16:49:24 +0100 Subject: [PATCH 076/521] Release only on develop --- .github/workflows/release-develop.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 8cecc5f3d9..ebf3cb007e 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -31,12 +31,12 @@ jobs: token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} fetch-depth: 1 - # - name: Fail if tag is not develop - # run: | - # if ! git merge-base --is-ancestor ${{ github.sha }} origin/develop; then - # echo "Tag is not in develop" - # exit 1 - # fi + - name: Fail if tag is not develop + run: | + if ! git merge-base --is-ancestor ${{ github.sha }} origin/develop; then + echo "Tag is not in develop" + exit 1 + fi - uses: actions/setup-node@v1 with: From 842c63aa2b7c7ac65c4b902e3f2cdbcaac192a2c Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 16:50:11 +0100 Subject: [PATCH 077/521] Undo wrong deletes --- packages/cli/package.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/cli/package.json b/packages/cli/package.json index 21713fba2a..7494b6f1c9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -33,9 +33,15 @@ "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", "axios": "0.21.2", + "chalk": "4.1.0", + "cli-progress": "3.11.2", + "commander": "7.1.0", + "docker-compose": "0.23.12", + "dotenv": "16.0.1", "download": "8.0.0", "find-free-port": "^2.0.0", "inquirer": "8.0.0", + "joi": "17.6.0", "lookpath": "1.1.0", "node-fetch": "2.6.7", "pkg": "5.8.0", From 9bfbe38ba2020c8e4567fd1debdfda7d4a55aac7 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:26:12 +0100 Subject: [PATCH 078/521] Undo wrong deletes --- packages/frontend-core/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 3a8a7bc9f6..84c39571e4 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -8,6 +8,7 @@ "dependencies": { "@budibase/bbui": "0.0.1", "@budibase/shared-core": "0.0.1", + "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", "svelte": "^3.46.2" From 35bc055ba608cdd7510af393ad1fdb74bd0b40a9 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:29:04 +0100 Subject: [PATCH 079/521] Change release pipelines --- .github/workflows/release-develop.yml | 5 +-- .github/workflows/release-master.yml | 53 ++++++++++++++------------- .github/workflows/tag-release.yml | 48 ++++++++++++++++++++++++ package.json | 2 +- 4 files changed, 79 insertions(+), 29 deletions(-) create mode 100644 .github/workflows/tag-release.yml diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index ebf3cb007e..eecda4d926 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -65,11 +65,10 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - git submodule foreach git commit -a -m 'release process' - git commit -a -m 'release process' + git submodule foreach git commit -a -m 'Release process' + git commit -a -m 'Release process' echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop - echo 'Done' - name: Build/release Docker images run: | diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index e88fbbf0b8..cd0f3d40d7 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -3,29 +3,16 @@ concurrency: release on: push: - branches: - - master - paths: - - ".aws/**" - - ".github/**" - - "charts/**" - - "packages/**" - - "scripts/**" - - "package.json" - - "yarn.lock" - - "package.json" - - "yarn.lock" + tags: + - v* + tags-ignore: + - v*-alpha.* workflow_dispatch: inputs: - versioning: - type: choice - description: "Versioning type: patch, minor, major" - default: patch - options: - - patch - - minor - - major + tags: + description: "Release tag" required: true + type: boolean env: # Posthog token used by ui at build time @@ -38,20 +25,34 @@ jobs: release-images: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + fetch-depth: 1 + - name: Fail if branch is not master if: github.ref != 'refs/heads/master' run: | echo "Ref is not master, you must run this job from master." exit 1 - - uses: actions/checkout@v2 - with: - submodules: true - token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + - uses: actions/setup-node@v1 with: node-version: 14.x - run: yarn + - name: Update versions + run: | + version=$(cat lerna.json \ + | grep version \ + | head -1 \ + | awk -F: '{gsub(/"/,"",$2);gsub(/[[:space:]]*/,"",$2); print $2}' \ + | sed 's/[",]//g') + echo "Setting version $version" + yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" + node scripts/updateVersions.js $version + yarn - run: yarn bootstrap - run: yarn lint - run: yarn build @@ -65,6 +66,8 @@ jobs: # setup the username and email. I tend to use 'GitHub Actions Bot' with no email by default git config --global user.name "Budibase Release Bot" git config --global user.email "<>" + git submodule foreach git commit -a -m 'Release process' + git commit -a -m 'Release process' echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release @@ -104,7 +107,7 @@ jobs: git config user.name "Budibase Helm Bot" git config user.email "<>" git reset --hard - git pull + git fetch mkdir sync echo "Packaging chart to sync dir" helm package charts/budibase --version 0.0.0-master --app-version v"$RELEASE_VERSION" --destination sync diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml new file mode 100644 index 0000000000..da53612bd9 --- /dev/null +++ b/.github/workflows/tag-release.yml @@ -0,0 +1,48 @@ +name: Tag prerelease +concurrency: release-prerelease + +on: + push: + branches: + - master + paths: + - ".aws/**" + - ".github/**" + - "charts/**" + - "packages/**" + - "scripts/**" + - "package.json" + - "yarn.lock" + workflow_dispatch: + inputs: + versioning: + type: choice + description: "Versioning type: patch, minor, major" + default: patch + options: + - patch + - minor + - major + required: true + +jobs: + tag-prerelease: + runs-on: ubuntu-latest + + steps: + - name: Fail if branch is not master + if: github.ref != 'refs/heads/master' + run: | + echo "Ref is not master, you must run this job from master." + exit 1 + - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + + - name: Tag prerelease + run: | + # setup the username and email. + git config --global user.name "Budibase Staging Release Bot" + git config --global user.email "<>" + ./scripts/versionCommit.sh ${{ github.event.inputs.versioning }} diff --git a/package.json b/package.json index 1e2fea88f3..742b65f90c 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "backend:build": "./scripts/scopeBackend.sh 'lerna run --stream build'", "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", - "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", + "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish --no-git-tag-version --no-push --no-git-reset", "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --no-git-reset", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", From e09e1c86275e6ee3ea303565bbba30f0eaaf2dea Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:36:48 +0100 Subject: [PATCH 080/521] Use local pro --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 21 ++++++++++++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 96bdf5ed88..f0ece87bed 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "0.0.1", "@budibase/client": "0.0.1", - "@budibase/pro": "develop", + "@budibase/pro": "0.0.1", "@budibase/shared-core": "0.0.1", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index 334c4ff1e8..d3bc7e3b13 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "0.0.1", - "@budibase/pro": "develop", + "@budibase/pro": "0.0.1", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 651125dd3b..4bd6c49403 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7777,6 +7777,13 @@ cli-cursor@3.1.0, cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" +cli-progress@3.11.2: + version "3.11.2" + resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.11.2.tgz#f8c89bd157e74f3f2c43bcfb3505670b4d48fc77" + integrity sha512-lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA== + dependencies: + string-width "^4.2.3" + cli-spinners@2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" @@ -8066,6 +8073,11 @@ commander@6.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75" integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q== +commander@7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff" + integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg== + commander@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.0.tgz#71797971162cd3cf65f0b9d24eb28f8d303acdf1" @@ -8860,7 +8872,7 @@ dateformat@^4.5.1, dateformat@^4.6.3: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== -dayjs@^1.10.4, dayjs@^1.10.5, dayjs@^1.11.2: +dayjs@^1.10.4, dayjs@^1.10.5, dayjs@^1.11.2, dayjs@^1.11.7: version "1.11.7" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== @@ -9506,6 +9518,13 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" +docker-compose@0.23.12: + version "0.23.12" + resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.12.tgz#fa883b98be08f6926143d06bf9e522ef7ed3210c" + integrity sha512-KFbSMqQBuHjTGZGmYDOCO0L4SaML3BsWTId5oSUyaBa22vALuFHNv+UdDWs3HcMylHWKsxCbLB7hnM/nCosWZw== + dependencies: + yaml "^1.10.2" + docker-compose@0.23.17: version "0.23.17" resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.17.tgz#8816bef82562d9417dc8c790aa4871350f93a2ba" From 2f8c50cee1263b65f87424a46a4353cf06355560 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:37:09 +0100 Subject: [PATCH 081/521] Rename scripts --- .github/workflows/release-develop.yml | 2 +- .github/workflows/release-master.yml | 2 +- scripts/{updateVersions.js => syncLocalDependencies.js} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename scripts/{updateVersions.js => syncLocalDependencies.js} (100%) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index eecda4d926..7f5002b5ee 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -52,7 +52,7 @@ jobs: | sed 's/[",]//g') echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" - node scripts/updateVersions.js $version + node scripts/syncLocalDependencies.js $version yarn - run: yarn bootstrap - run: yarn build diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index cd0f3d40d7..d981154b4c 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -51,7 +51,7 @@ jobs: | sed 's/[",]//g') echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" - node scripts/updateVersions.js $version + node scripts/syncLocalDependencies.js $version yarn - run: yarn bootstrap - run: yarn lint diff --git a/scripts/updateVersions.js b/scripts/syncLocalDependencies.js similarity index 100% rename from scripts/updateVersions.js rename to scripts/syncLocalDependencies.js From c9ab1f4a368bfec151c0ade8ebcb502944c83cea Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:44:11 +0100 Subject: [PATCH 082/521] Script to update pro deps --- scripts/bootstrap.sh | 3 +++ scripts/updateLocalPro.js | 41 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100755 scripts/updateLocalPro.js diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 4e7eadc4ab..37cb4c1279 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -4,4 +4,7 @@ if [ -d "packages/pro/packages" ]; then yarn lerna bootstrap yarn setup +else + node scripts/updateLocalPro.js + yarn fi \ No newline at end of file diff --git a/scripts/updateLocalPro.js b/scripts/updateLocalPro.js new file mode 100755 index 0000000000..ad1ab1f987 --- /dev/null +++ b/scripts/updateLocalPro.js @@ -0,0 +1,41 @@ +const fs = require("fs") +const path = require("path") +const { execSync } = require("child_process") + +// Get the version argument from the command line +let version = process.argv[2] +if (!version) { + console.error("Usage: node updateLocalPro.js ") + process.exit(1) +} + +if (version === "local") { + version = "0.0.1" +} + +// Get the list of workspaces with mismatched dependencies +const output = execSync("yarn --silent workspaces info --json", { + encoding: "utf-8", +}) +const data = JSON.parse(output) + +// Loop through each workspace and update the dependencies +Object.keys(data).forEach(workspace => { + // Loop through each dependency and update its version in package.json + const packageJsonPath = path.join(data[workspace].location, "package.json") + const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8")) + let hasChanges = false + + if (packageJson.dependencies["@budibase/pro"]) { + packageJson.dependencies["@budibase/pro"] = version + hasChanges = true + } + + // Write changes to package.json if there are any + if (hasChanges) { + fs.writeFileSync( + packageJsonPath, + JSON.stringify(packageJson, null, 2) + "\n" + ) + } +}) From 50a0662a99977359fdca66686923fbe9f6e32280 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:52:05 +0100 Subject: [PATCH 083/521] Smart script --- package.json | 6 +++--- .../{updateLocalPro.js => syncProPackage.js} | 20 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) rename scripts/{updateLocalPro.js => syncProPackage.js} (77%) diff --git a/package.json b/package.json index 742b65f90c..99c945e567 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "scripts": { "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", - "bootstrap": "./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh", + "bootstrap": "node scripts/syncProPackage.js && yarn && ./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh", "build": "lerna run --stream build", "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput", "backend:bootstrap": "./scripts/scopeBackend.sh && yarn run bootstrap", @@ -80,8 +80,8 @@ "security:audit": "node scripts/audit.js", "postinstall": "husky install", "dep:clean": "yarn clean -y && yarn bootstrap", - "submodules:load": "git submodule init && git submodule update && yarn && yarn bootstrap", - "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap" + "submodules:load": "git submodule init && git submodule update && yarn bootstrap", + "submodules:unload": "git submodule deinit --all && yarn bootstrap" }, "workspaces": { "packages": [ diff --git a/scripts/updateLocalPro.js b/scripts/syncProPackage.js similarity index 77% rename from scripts/updateLocalPro.js rename to scripts/syncProPackage.js index ad1ab1f987..c84ed1c71f 100755 --- a/scripts/updateLocalPro.js +++ b/scripts/syncProPackage.js @@ -2,15 +2,17 @@ const fs = require("fs") const path = require("path") const { execSync } = require("child_process") -// Get the version argument from the command line -let version = process.argv[2] -if (!version) { - console.error("Usage: node updateLocalPro.js ") - process.exit(1) -} - -if (version === "local") { - version = "0.0.1" +let version = "0.0.1" +const localPro = fs.existsSync("/packages/pro/packages") +if (!localPro) { + const branchName = execSync("git rev-parse --abbrev-ref HEAD") + .toString() + .trim() + if (branchName === "master") { + version = "latest" + } else { + version = "develop" + } } // Get the list of workspaces with mismatched dependencies From f993a7a6b2bff87b668d41d3b67e8912982b56a1 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:54:12 +0100 Subject: [PATCH 084/521] Fix script --- scripts/syncProPackage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/syncProPackage.js b/scripts/syncProPackage.js index c84ed1c71f..236586fdf2 100755 --- a/scripts/syncProPackage.js +++ b/scripts/syncProPackage.js @@ -3,7 +3,7 @@ const path = require("path") const { execSync } = require("child_process") let version = "0.0.1" -const localPro = fs.existsSync("/packages/pro/packages") +const localPro = fs.existsSync("packages/pro/packages") if (!localPro) { const branchName = execSync("git rev-parse --abbrev-ref HEAD") .toString() From 1b8a780cb2d1bbcfae4379acf93b876ce1d3ff20 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 18:16:12 +0100 Subject: [PATCH 085/521] Clean scripts --- package.json | 2 +- scripts/bootstrap.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 99c945e567..274edd2343 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "scripts": { "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", - "bootstrap": "node scripts/syncProPackage.js && yarn && ./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh", + "bootstrap": "./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh", "build": "lerna run --stream build", "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput", "backend:bootstrap": "./scripts/scopeBackend.sh && yarn run bootstrap", diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 37cb4c1279..844490a00e 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,10 +1,10 @@ +node scripts/syncProPackage.js +yarn + if [ -d "packages/pro/packages" ]; then cd packages/pro yarn lerna bootstrap yarn setup -else - node scripts/updateLocalPro.js - yarn fi \ No newline at end of file From 7cc859087ec1d8c7da2482e0853df9a4a8cdf193 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 18:22:19 +0100 Subject: [PATCH 086/521] Execute pro checks on preinstall --- package.json | 1 + scripts/bootstrap.sh | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 274edd2343..7ed38ad610 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "typescript": "4.7.3" }, "scripts": { + "preinstall": "node scripts/syncProPackage.js", "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", "bootstrap": "./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh", "build": "lerna run --stream build", diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 844490a00e..4e7eadc4ab 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,6 +1,3 @@ -node scripts/syncProPackage.js -yarn - if [ -d "packages/pro/packages" ]; then cd packages/pro From dfa33eb27bb50945c01861755fd60c6d7bd7b81a Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 18:23:10 +0100 Subject: [PATCH 087/521] Add yarn install back --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7ed38ad610..0689c81699 100644 --- a/package.json +++ b/package.json @@ -81,8 +81,8 @@ "security:audit": "node scripts/audit.js", "postinstall": "husky install", "dep:clean": "yarn clean -y && yarn bootstrap", - "submodules:load": "git submodule init && git submodule update && yarn bootstrap", - "submodules:unload": "git submodule deinit --all && yarn bootstrap" + "submodules:load": "git submodule init && git submodule update && yarn && yarn bootstrap", + "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap" }, "workspaces": { "packages": [ From 02234f32c6398021c4fd75daec2c7ed187c7cef4 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 18:28:24 +0100 Subject: [PATCH 088/521] Undo trigger --- .github/workflows/release-master.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index d981154b4c..3eda2a9829 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -3,8 +3,6 @@ concurrency: release on: push: - tags: - - v* tags-ignore: - v*-alpha.* workflow_dispatch: From d515d8981813b593f2e2e75e725f68490c89b3ea Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 18:29:18 +0100 Subject: [PATCH 089/521] Remove trigger --- .github/workflows/release-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index 3eda2a9829..cdf4950af9 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -2,7 +2,7 @@ name: Budibase Release concurrency: release on: - push: + tag: tags-ignore: - v*-alpha.* workflow_dispatch: From 510544baebe5179d59eb29fe0aaee9311267dbf8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 18:29:22 +0100 Subject: [PATCH 090/521] Remove trigger --- .github/workflows/release-master.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index cdf4950af9..51b40a8641 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -2,9 +2,6 @@ name: Budibase Release concurrency: release on: - tag: - tags-ignore: - - v*-alpha.* workflow_dispatch: inputs: tags: From db6a9f97d7932d3fdd90b72b6f21d91b715c321d Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 24 Apr 2023 19:00:21 +0100 Subject: [PATCH 091/521] Use tags --- .github/workflows/release-master.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index 51b40a8641..553298c9e3 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -2,6 +2,11 @@ name: Budibase Release concurrency: release on: + push: + tags: + - 'v[0-9]+.[0-9]+.[0-9]+' + # Exclude all pre-releases + - '!v*[0-9]+.[0-9]+.[0-9]+-*' workflow_dispatch: inputs: tags: @@ -30,7 +35,8 @@ jobs: if: github.ref != 'refs/heads/master' run: | echo "Ref is not master, you must run this job from master." - exit 1 + // Change to "exit 1" when merged. Left to 0 to not fail all the pipelines and not to cause noise + exit 0 - uses: actions/setup-node@v1 with: From 452e7b6ecd99f77c7b62cf9b6116ee56f259d508 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 24 Apr 2023 20:02:43 +0100 Subject: [PATCH 092/521] Update yarn.lock --- yarn.lock | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 4bd6c49403..3468036c37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24432,7 +24432,15 @@ vlq@^0.2.2: resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow== -vm2@3.9.16, vm2@^3.9.11, vm2@^3.9.15: +vm2@3.9.17: + version "3.9.17" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" + integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.0" + +vm2@^3.9.11, vm2@^3.9.15: version "3.9.16" resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.16.tgz#0fbc2a265f7bf8b837cea6f4a908f88a3f93b8e6" integrity sha512-3T9LscojNTxdOyG+e8gFeyBXkMlOBYDoF6dqZbj+MPVHi9x10UfiTAJIobuchRCp3QvC+inybTbMJIUrLsig0w== From c139768b1db31e3c74a30668edd3c68e600e9813 Mon Sep 17 00:00:00 2001 From: adrinr Date: Tue, 25 Apr 2023 10:13:58 +0100 Subject: [PATCH 093/521] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 315e57dc91..26d3a26c1e 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 315e57dc9185dede169af073a01cc23e673b7091 +Subproject commit 26d3a26c1e5b0fbfd6fc5614b30934352b8cf5ae From f3be917da115069c27cad05f2f54b04abfc53a7e Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 25 Apr 2023 12:16:02 +0100 Subject: [PATCH 094/521] Enrich the upgradable version property when fetching the app package --- packages/builder/src/builderStore/store/frontend.js | 1 + .../builder/src/components/deploy/VersionModal.svelte | 9 ++++----- .../builder/portal/overview/[appId]/overview.svelte | 7 +++---- .../pages/builder/portal/overview/[appId]/version.svelte | 5 ++--- packages/server/src/api/controllers/application.ts | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 3fc0eb769e..e264dc099b 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -134,6 +134,7 @@ export const getFrontendStore = () => { previousTopNavPath: {}, version: application.version, revertableVersion: application.revertableVersion, + upgradableVersion: application.upgradableVersion, navigation: application.navigation || {}, usedPlugins: application.usedPlugins || [], })) diff --git a/packages/builder/src/components/deploy/VersionModal.svelte b/packages/builder/src/components/deploy/VersionModal.svelte index f357cc7820..75acc974ce 100644 --- a/packages/builder/src/components/deploy/VersionModal.svelte +++ b/packages/builder/src/components/deploy/VersionModal.svelte @@ -9,7 +9,6 @@ } from "@budibase/bbui" import { store } from "builderStore" import { API } from "api" - import clientPackage from "@budibase/client/package.json" export function show() { updateModal.show() @@ -25,9 +24,9 @@ $: appId = $store.appId $: updateAvailable = - clientPackage.version && + $store.upgradableVersion && $store.version && - clientPackage.version !== $store.version + $store.upgradableVersion !== $store.version $: revertAvailable = $store.revertableVersion != null const refreshAppPackage = async () => { @@ -46,7 +45,7 @@ // Don't wait for the async refresh, since this causes modal flashing refreshAppPackage() notifications.success( - `App updated successfully to version ${clientPackage.version}` + `App updated successfully to version ${$store.upgradableVersion}` ) } catch (err) { notifications.error(`Error updating app: ${err}`) @@ -91,7 +90,7 @@ {#if updateAvailable} This app is currently using version {$store.version}, but version - {clientPackage.version} is available. Updates can contain new features, + {$store.upgradableVersion} is available. Updates can contain new features, performance improvements and bug fixes. {:else} diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte index 2d2b6775fb..c049a610b6 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte @@ -13,7 +13,6 @@ notifications, } from "@budibase/bbui" import { store } from "builderStore" - import clientPackage from "@budibase/client/package.json" import { processStringSync } from "@budibase/string-templates" import { users, auth, apps, groups, overview } from "stores/portal" import { fetchData } from "@budibase/frontend-core" @@ -40,7 +39,7 @@ }, }, }) - $: updateAvailable = clientPackage.version !== $store.version + $: updateAvailable = $store.upgradableVersion !== $store.version $: isPublished = app?.status === AppStatus.DEPLOYED $: appEditorId = !app?.updatedBy ? $auth.user._id : app?.updatedBy $: appEditorText = appEditor?.firstName || appEditor?.email @@ -172,8 +171,8 @@ {$store.version} {#if updateAvailable}
- New version {clientPackage.version} is available - - + New version {$store.upgradableVersion} is + available - { $goto("./version") diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte index 676d0b4f59..723e32984d 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte @@ -1,12 +1,11 @@ @@ -18,7 +17,7 @@ {#if updateAvailable} The app is currently using version {$store.version} - but version {clientPackage.version} is available. + but version {$store.upgradableVersion} is available.
Updates can contain new features, performance improvements and bug fixes. diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index ec68ca4c72..77a4e7c7f1 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -223,7 +223,7 @@ export async function fetchAppPackage(ctx: UserCtx) { ) ctx.body = { - application, + application : {...application, upgradableVersion : envCore.VERSION}, screens, layouts, clientLibPath, From 72c72fc48ae49a1558b130177fc78541393f94d8 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 25 Apr 2023 12:31:52 +0100 Subject: [PATCH 095/521] Lint fix --- packages/server/src/api/controllers/application.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index 77a4e7c7f1..ff0dbe015b 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -223,7 +223,7 @@ export async function fetchAppPackage(ctx: UserCtx) { ) ctx.body = { - application : {...application, upgradableVersion : envCore.VERSION}, + application: { ...application, upgradableVersion: envCore.VERSION }, screens, layouts, clientLibPath, From 608a38489fdc90b91507621f7a986978cef39793 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 25 Apr 2023 12:34:50 +0100 Subject: [PATCH 096/521] Export undefineds as empty values in csv, instead of empty strings --- packages/server/src/api/controllers/row/internal.ts | 5 ++++- packages/server/src/api/controllers/row/utils.ts | 4 ++-- packages/server/src/api/controllers/view/exporters.ts | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/server/src/api/controllers/row/internal.ts b/packages/server/src/api/controllers/row/internal.ts index a0bebc2490..cc1450060c 100644 --- a/packages/server/src/api/controllers/row/internal.ts +++ b/packages/server/src/api/controllers/row/internal.ts @@ -37,7 +37,7 @@ import { Table, } from "@budibase/types" -const { cleanExportRows } = require("./utils") +import { cleanExportRows } from "./utils" const CALCULATION_TYPES = { SUM: "sum", @@ -391,6 +391,9 @@ export async function exportRows(ctx: UserCtx) { const table = await db.get(ctx.params.tableId) const rowIds = ctx.request.body.rows let format = ctx.query.format + if (typeof format !== "string") { + ctx.throw(400, "Format parameter is not valid") + } const { columns, query } = ctx.request.body let result diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts index e96a4fe6ee..a7c467ea61 100644 --- a/packages/server/src/api/controllers/row/utils.ts +++ b/packages/server/src/api/controllers/row/utils.ts @@ -137,8 +137,8 @@ export function cleanExportRows( delete schema[column] }) - // Intended to avoid 'undefined' in export if (format === Format.CSV) { + // Intended to append empty values in export const schemaKeys = Object.keys(schema) for (let key of schemaKeys) { if (columns?.length && columns.indexOf(key) > 0) { @@ -146,7 +146,7 @@ export function cleanExportRows( } for (let row of cleanRows) { if (row[key] == null) { - row[key] = "" + row[key] = undefined } } } diff --git a/packages/server/src/api/controllers/view/exporters.ts b/packages/server/src/api/controllers/view/exporters.ts index 4d927bca27..ec0aca95a9 100644 --- a/packages/server/src/api/controllers/view/exporters.ts +++ b/packages/server/src/api/controllers/view/exporters.ts @@ -10,7 +10,9 @@ export function csv(headers: string[], rows: Row[]) { val = typeof val === "object" && !(val instanceof Date) ? `"${JSON.stringify(val).replace(/"/g, "'")}"` - : `"${val}"` + : val !== undefined + ? `"${val}"` + : "" return val.trim() }) .join(",")}` From 91b2f4165db9155a5b5d2d45357ab8bbf53a5156 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 25 Apr 2023 14:28:18 +0100 Subject: [PATCH 097/521] Make it more obvious that multi select cells have overflow when using small line height --- .../src/components/grid/cells/DataCell.svelte | 2 ++ .../src/components/grid/cells/OptionsCell.svelte | 10 +++++++++- .../src/components/grid/layout/GridRow.svelte | 2 ++ .../src/components/grid/layout/StickyColumn.svelte | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/cells/DataCell.svelte b/packages/frontend-core/src/components/grid/cells/DataCell.svelte index 5a2e02340f..59e81b3081 100644 --- a/packages/frontend-core/src/components/grid/cells/DataCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/DataCell.svelte @@ -19,6 +19,7 @@ export let updateValue = rows.actions.updateValue export let invertX = false export let invertY = false + export let contentLines = 1 const emptyError = writable(null) @@ -84,5 +85,6 @@ {readonly} {invertY} {invertX} + {contentLines} /> diff --git a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte index f3b6b9b59d..9be26d9520 100644 --- a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte @@ -12,6 +12,7 @@ export let api export let invertX = false export let invertY = false + export let contentLines let isOpen = false let focusedOptionIdx = null @@ -86,7 +87,11 @@ class:open on:click|self={editable ? open : null} > -
+
1} + on:click={editable ? open : null} + > {#each values as val} {@const color = getOptionColor(val)} {#if color} @@ -160,6 +165,9 @@ grid-row-gap: var(--cell-padding); overflow: hidden; padding: var(--cell-padding); + flex-wrap: nowrap; + } + .values.wrap { flex-wrap: wrap; } .text { diff --git a/packages/frontend-core/src/components/grid/layout/GridRow.svelte b/packages/frontend-core/src/components/grid/layout/GridRow.svelte index eb1fd8b96a..ff182d4ec2 100644 --- a/packages/frontend-core/src/components/grid/layout/GridRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/GridRow.svelte @@ -15,6 +15,7 @@ selectedCellMap, focusedRow, columnHorizontalInversionIndex, + contentLines, } = getContext("grid") $: rowSelected = !!$selectedRows[row._id] @@ -44,6 +45,7 @@ focused={$focusedCellId === cellId} selectedUser={$selectedCellMap[cellId]} width={column.width} + contentLines={$contentLines} /> {/each}
diff --git a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte index 6f10c30695..44be0777cf 100644 --- a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte +++ b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte @@ -21,6 +21,7 @@ focusedRow, scrollLeft, dispatch, + contentLines, } = getContext("grid") $: rowCount = $rows.length @@ -85,6 +86,7 @@ selectedUser={$selectedCellMap[cellId]} width={$stickyColumn.width} column={$stickyColumn} + contentLines={$contentLines} /> {/if}
From c691dafc3909eba9b1df93fce13a21d8dccfd582 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 12:04:41 +0100 Subject: [PATCH 098/521] Add default value to contentLines --- .../src/components/grid/cells/OptionsCell.svelte | 2 +- .../src/components/grid/cells/RelationshipCell.svelte | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte index 9be26d9520..993d99fef1 100644 --- a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte @@ -12,7 +12,7 @@ export let api export let invertX = false export let invertY = false - export let contentLines + export let contentLines = 1 let isOpen = false let focusedOptionIdx = null diff --git a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte index 90182e9983..13dc2ae76f 100644 --- a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte @@ -29,6 +29,7 @@ export let onChange export let invertX = false export let invertY = false + export let contentLines = 1 const { API, dispatch } = getContext("grid") const color = getColor(0) @@ -243,7 +244,11 @@
-
(focused ? e.stopPropagation() : null)}> +
1} + on:wheel={e => (focused ? e.stopPropagation() : null)} + > {#each value || [] as relationship, idx} {#if relationship.primaryDisplay}
@@ -376,6 +381,9 @@ grid-row-gap: var(--cell-padding); overflow: hidden; padding: var(--cell-padding); + flex-wrap: nowrap; + } + .values.wrap { flex-wrap: wrap; } .count { From 15bf1ace68e9ab56676927934214af67584bbc74 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 12:10:12 +0100 Subject: [PATCH 099/521] Standardise width of design section side panels to fix drawer width issues --- .../layouts/[layoutId]/_components/LayoutSettingsPanel.svelte | 2 +- .../navigation/_components/NavigationInfoPanel.svelte | 2 +- .../[screenId]/screens/_components/ScreenSettingsPanel.svelte | 1 + .../design/[screenId]/theme/_components/ThemeInfoPanel.svelte | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte index 8e6ac603e7..bfc2f94f43 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte @@ -35,7 +35,7 @@ } - + Custom layouts are being deprecated. They will be removed in a future diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte index dbd23c462f..614e1eed80 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte @@ -9,7 +9,7 @@ } - + {#if $selectedScreen.layoutId} {#if $selectedScreen.layoutId} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte index 9593f0bff5..c3325852c8 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte @@ -3,7 +3,7 @@ import { Body, Layout } from "@budibase/bbui" - + Your theme is set across all the screens within your app. From 457c1ce0a12fe843121397de1313289546a4871d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 12:16:31 +0000 Subject: [PATCH 100/521] v2.5.6-alpha.31 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index ee4d8e8598..27b8e76640 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 7477406505..3c37d8cf7e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.30", + "@budibase/types": "2.5.6-alpha.31", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6d4ba0a882..dac3c37ad6 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.30", - "@budibase/string-templates": "2.5.6-alpha.30", + "@budibase/shared-core": "2.5.6-alpha.31", + "@budibase/string-templates": "2.5.6-alpha.31", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index ac8a626b0e..9226047059 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.30", - "@budibase/client": "2.5.6-alpha.30", - "@budibase/frontend-core": "2.5.6-alpha.30", - "@budibase/shared-core": "2.5.6-alpha.30", - "@budibase/string-templates": "2.5.6-alpha.30", + "@budibase/bbui": "2.5.6-alpha.31", + "@budibase/client": "2.5.6-alpha.31", + "@budibase/frontend-core": "2.5.6-alpha.31", + "@budibase/shared-core": "2.5.6-alpha.31", + "@budibase/string-templates": "2.5.6-alpha.31", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index bdb41bec15..044809461e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.30", - "@budibase/string-templates": "2.5.6-alpha.30", - "@budibase/types": "2.5.6-alpha.30", + "@budibase/backend-core": "2.5.6-alpha.31", + "@budibase/string-templates": "2.5.6-alpha.31", + "@budibase/types": "2.5.6-alpha.31", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 66bd6d4c1e..4720dc10f8 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.30", - "@budibase/frontend-core": "2.5.6-alpha.30", - "@budibase/shared-core": "2.5.6-alpha.30", - "@budibase/string-templates": "2.5.6-alpha.30", - "@budibase/types": "2.5.6-alpha.30", + "@budibase/bbui": "2.5.6-alpha.31", + "@budibase/frontend-core": "2.5.6-alpha.31", + "@budibase/shared-core": "2.5.6-alpha.31", + "@budibase/string-templates": "2.5.6-alpha.31", + "@budibase/types": "2.5.6-alpha.31", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 3f5345ef94..2270ad51bd 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.30", - "@budibase/shared-core": "2.5.6-alpha.30", + "@budibase/bbui": "2.5.6-alpha.31", + "@budibase/shared-core": "2.5.6-alpha.31", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0307ebfa6b..f05152cd48 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 6aadfd15a0..4be71fffc2 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.30", + "version": "2.5.6-alpha.31", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.30", - "@budibase/client": "2.5.6-alpha.30", + "@budibase/backend-core": "2.5.6-alpha.31", + "@budibase/client": "2.5.6-alpha.31", "@budibase/pro": "2.5.6-alpha.30", - "@budibase/shared-core": "2.5.6-alpha.30", - "@budibase/string-templates": "2.5.6-alpha.30", - "@budibase/types": "2.5.6-alpha.30", + "@budibase/shared-core": "2.5.6-alpha.31", + "@budibase/string-templates": "2.5.6-alpha.31", + "@budibase/types": "2.5.6-alpha.31", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 75fe1950dc..a9ce442863 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.30" + "@budibase/types": "2.5.6-alpha.31" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 30ed86b2a7..63adf7f26b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 95f04b8495..78fbf474b5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index c0d50cab28..df15546241 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.30", + "version": "2.5.6-alpha.31", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.30", + "@budibase/backend-core": "2.5.6-alpha.31", "@budibase/pro": "2.5.6-alpha.30", - "@budibase/string-templates": "2.5.6-alpha.30", - "@budibase/types": "2.5.6-alpha.30", + "@budibase/string-templates": "2.5.6-alpha.31", + "@budibase/types": "2.5.6-alpha.31", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 349f4b426ea6eb667291769101ef44dca3930799 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 12:18:01 +0000 Subject: [PATCH 101/521] Update pro version to 2.5.6-alpha.31 --- 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 4be71fffc2..9d7569a242 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.31", "@budibase/client": "2.5.6-alpha.31", - "@budibase/pro": "2.5.6-alpha.30", + "@budibase/pro": "2.5.6-alpha.31", "@budibase/shared-core": "2.5.6-alpha.31", "@budibase/string-templates": "2.5.6-alpha.31", "@budibase/types": "2.5.6-alpha.31", diff --git a/packages/worker/package.json b/packages/worker/package.json index df15546241..881f04efc9 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.31", - "@budibase/pro": "2.5.6-alpha.30", + "@budibase/pro": "2.5.6-alpha.31", "@budibase/string-templates": "2.5.6-alpha.31", "@budibase/types": "2.5.6-alpha.31", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 260f0ae6a6..a119a9341d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.29": - version "2.5.6-alpha.29" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.29.tgz#71414f68a296535ef53ffb0453352ea137c4aeab" - integrity sha512-tQuzMOo2WFxKvsUgYAfUEcLabRpmAD7hPlhBhCFzYasaXNbJiPhcwv4i52US0i0Wr2IXMb2X0d7fwa8tnbKzIA== +"@budibase/pro@2.5.6-alpha.30": + version "2.5.6-alpha.30" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.30.tgz#9b8089a983fd61a062f31a8e5757d7bb5b56fb8c" + integrity sha512-YTyjMHK/wsSOFJkON7a5WRJSgAr8Gh/cflRzifm6Jw1Gb8S8B8Z6uTWW/S7+psVBRGeUfV1s8biYNr71tXz2Ng== dependencies: - "@budibase/backend-core" "2.5.6-alpha.29" + "@budibase/backend-core" "2.5.6-alpha.30" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.29" + "@budibase/types" "2.5.6-alpha.30" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 5dff2f30173a32cf122b20b96dd40635577c4bd5 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 26 Apr 2023 14:16:36 +0100 Subject: [PATCH 102/521] Added pending users to user portal screen --- .../builder/portal/users/users/index.svelte | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte index 984ecd46ff..0c69e2c213 100644 --- a/packages/builder/src/pages/builder/portal/users/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte @@ -110,6 +110,27 @@ } }) } + let invitesLoaded = false + let pendingInvites = [] + let parsedInvites = [] + + const invitesToSchema = invites => { + return invites.map(invite => { + const { admin, builder, userGroups, apps } = invite.info + + return { + email: invite.email, + builder, + admin, + userGroups: userGroups, + apps: apps ? [...new Set(Object.keys(apps))] : undefined, + } + }) + } + $: parsedInvites = invitesToSchema(pendingInvites) + $: console.log("parsed invites ", parsedInvites) + // $: console.log(pendingInvites) + $: console.log(enrichedUsers) const updateFetch = email => { fetch.update({ @@ -232,6 +253,9 @@ try { await groups.actions.init() groupsLoaded = true + + pendingInvites = await users.getInvites() + invitesLoaded = true } catch (error) { notifications.error("Error fetching user group data") } @@ -326,6 +350,23 @@
+ + + Pending invitations + A list of all pending user invitations + + + + + + From 13134e0bb04a9c67935d5a47b2a77fbf6bf0aceb Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 26 Apr 2023 14:22:23 +0100 Subject: [PATCH 103/521] Removed client package from builder dependencies --- packages/builder/package.json | 1 - yarn.lock | 58 +++++++++++++++++++++++++++++++---- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/packages/builder/package.json b/packages/builder/package.json index 0bf4940d94..736eba5473 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -59,7 +59,6 @@ }, "dependencies": { "@budibase/bbui": "2.5.6-alpha.27", - "@budibase/client": "2.5.6-alpha.27", "@budibase/frontend-core": "2.5.6-alpha.27", "@budibase/shared-core": "2.5.6-alpha.27", "@budibase/string-templates": "2.5.6-alpha.27", diff --git a/yarn.lock b/yarn.lock index 0d89d2cadf..8a77fcafc6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,6 +1386,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/backend-core@2.5.6-alpha.26": + version "2.5.6-alpha.26" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6-alpha.26.tgz#72029afe5a85402fa996e92b84ad56cb8c6bde45" + integrity sha512-ktP2SWwLjaDzJYLnadU1BcZlrfQkvhRb3T+v1SEciTBWi0vF7MUa7k5OW0EKwECpGA3VA576sbI7FgGu7m7Sxw== + dependencies: + "@budibase/nano" "10.1.2" + "@budibase/pouchdb-replication-stream" "1.2.10" + "@budibase/types" "2.5.6-alpha.26" + "@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" + "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1486,15 +1525,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.25": - version "2.5.6-alpha.25" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.25.tgz#bfe99536060422adb60da2f195acb05b24898c98" - integrity sha512-LEQec9N9gS+j5gt/eKwGzci5oKW1sRTIG8oUvH7faCoJjD7BWIhmNuQNFrNfg70C/zkxYy4CL/2s1P9oVR1B3g== +"@budibase/pro@2.5.6-alpha.26": + version "2.5.6-alpha.26" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.26.tgz#979f0de77db78ad4596e6295083047b71f7c7bcc" + integrity sha512-d0ZsggojThcg1m81UEPUHp7fuPaSVwG+HYXh3ElEXmeH7HJNOJrbD2K0U7zkaWzufLK9ay1H6qcaZ9ZHVg/z/Q== dependencies: - "@budibase/backend-core" "2.5.6-alpha.25" + "@budibase/backend-core" "2.5.6-alpha.26" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.25" + "@budibase/types" "2.5.6-alpha.26" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1547,6 +1586,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.6-alpha.26": + version "2.5.6-alpha.26" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6-alpha.26.tgz#09ac8f1e4f4dfd5e7e109839cd9db36d5c563dc4" + integrity sha512-C1eHWj4tRwsQb2dJbMdukxRFVqiyzRBhwIMuCSIdJg763sbn9TXTqWTBbljyG7ppH+Dwge+py9KtiFP2MpMCfQ== + dependencies: + scim-patch "^0.7.0" + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" From 5447422c4eea6163d0f691fa606cd12a3fe461fc Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 14:39:54 +0100 Subject: [PATCH 104/521] Remove leftover spreadsheet entry in manifest --- packages/client/manifest.json | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 84ffca314c..71637723c1 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5225,36 +5225,5 @@ "type": "schema", "suffix": "repeater" } - }, - "spreadsheet": { - "name": "Spreadsheet", - "icon": "ViewGrid", - "settings": [ - { - "key": "table", - "type": "table", - "label": "Table" - }, - { - "type": "filter", - "label": "Filtering", - "key": "filter" - }, - { - "type": "field/sortable", - "label": "Sort Column", - "key": "sortColumn" - }, - { - "type": "select", - "label": "Sort Order", - "key": "sortOrder", - "options": [ - "Ascending", - "Descending" - ], - "defaultValue": "Ascending" - } - ] } } From e178afe171dd76cc3088ab47ba41be8d8f2072bd Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 13:47:10 +0000 Subject: [PATCH 105/521] v2.5.6-alpha.32 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 27b8e76640..a542a51851 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 3c37d8cf7e..96f16747e0 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.31", + "@budibase/types": "2.5.6-alpha.32", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index dac3c37ad6..7664855326 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.31", - "@budibase/string-templates": "2.5.6-alpha.31", + "@budibase/shared-core": "2.5.6-alpha.32", + "@budibase/string-templates": "2.5.6-alpha.32", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 9226047059..0c240baf2c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.31", - "@budibase/client": "2.5.6-alpha.31", - "@budibase/frontend-core": "2.5.6-alpha.31", - "@budibase/shared-core": "2.5.6-alpha.31", - "@budibase/string-templates": "2.5.6-alpha.31", + "@budibase/bbui": "2.5.6-alpha.32", + "@budibase/client": "2.5.6-alpha.32", + "@budibase/frontend-core": "2.5.6-alpha.32", + "@budibase/shared-core": "2.5.6-alpha.32", + "@budibase/string-templates": "2.5.6-alpha.32", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 044809461e..f3ebc3beb9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.31", - "@budibase/string-templates": "2.5.6-alpha.31", - "@budibase/types": "2.5.6-alpha.31", + "@budibase/backend-core": "2.5.6-alpha.32", + "@budibase/string-templates": "2.5.6-alpha.32", + "@budibase/types": "2.5.6-alpha.32", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 4720dc10f8..69d38ed1c3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.31", - "@budibase/frontend-core": "2.5.6-alpha.31", - "@budibase/shared-core": "2.5.6-alpha.31", - "@budibase/string-templates": "2.5.6-alpha.31", - "@budibase/types": "2.5.6-alpha.31", + "@budibase/bbui": "2.5.6-alpha.32", + "@budibase/frontend-core": "2.5.6-alpha.32", + "@budibase/shared-core": "2.5.6-alpha.32", + "@budibase/string-templates": "2.5.6-alpha.32", + "@budibase/types": "2.5.6-alpha.32", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 2270ad51bd..70cec3f9e0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.31", - "@budibase/shared-core": "2.5.6-alpha.31", + "@budibase/bbui": "2.5.6-alpha.32", + "@budibase/shared-core": "2.5.6-alpha.32", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index f05152cd48..c38dedec7d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9d7569a242..30ef842461 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.31", + "version": "2.5.6-alpha.32", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.31", - "@budibase/client": "2.5.6-alpha.31", + "@budibase/backend-core": "2.5.6-alpha.32", + "@budibase/client": "2.5.6-alpha.32", "@budibase/pro": "2.5.6-alpha.31", - "@budibase/shared-core": "2.5.6-alpha.31", - "@budibase/string-templates": "2.5.6-alpha.31", - "@budibase/types": "2.5.6-alpha.31", + "@budibase/shared-core": "2.5.6-alpha.32", + "@budibase/string-templates": "2.5.6-alpha.32", + "@budibase/types": "2.5.6-alpha.32", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index a9ce442863..9b9eb21db1 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.31" + "@budibase/types": "2.5.6-alpha.32" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 63adf7f26b..8ac9d477b9 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 78fbf474b5..3a4bcd9efa 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 881f04efc9..fc94a224f2 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.31", + "version": "2.5.6-alpha.32", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.31", + "@budibase/backend-core": "2.5.6-alpha.32", "@budibase/pro": "2.5.6-alpha.31", - "@budibase/string-templates": "2.5.6-alpha.31", - "@budibase/types": "2.5.6-alpha.31", + "@budibase/string-templates": "2.5.6-alpha.32", + "@budibase/types": "2.5.6-alpha.32", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 71c8fec4db7ed91531eb703da910108f06955f16 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 13:48:46 +0000 Subject: [PATCH 106/521] Update pro version to 2.5.6-alpha.32 --- 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 30ef842461..1bc50f61d6 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.32", "@budibase/client": "2.5.6-alpha.32", - "@budibase/pro": "2.5.6-alpha.31", + "@budibase/pro": "2.5.6-alpha.32", "@budibase/shared-core": "2.5.6-alpha.32", "@budibase/string-templates": "2.5.6-alpha.32", "@budibase/types": "2.5.6-alpha.32", diff --git a/packages/worker/package.json b/packages/worker/package.json index fc94a224f2..77594a9896 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.32", - "@budibase/pro": "2.5.6-alpha.31", + "@budibase/pro": "2.5.6-alpha.32", "@budibase/string-templates": "2.5.6-alpha.32", "@budibase/types": "2.5.6-alpha.32", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index a119a9341d..653c549ffd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.30": - version "2.5.6-alpha.30" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.30.tgz#9b8089a983fd61a062f31a8e5757d7bb5b56fb8c" - integrity sha512-YTyjMHK/wsSOFJkON7a5WRJSgAr8Gh/cflRzifm6Jw1Gb8S8B8Z6uTWW/S7+psVBRGeUfV1s8biYNr71tXz2Ng== +"@budibase/pro@2.5.6-alpha.31": + version "2.5.6-alpha.31" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.31.tgz#e711fed348c64bffac5eb3b4dfed6be15c2253c9" + integrity sha512-gIpq5uICd0tQP+RB1Dv+v9m9EPG//HJJb95qFXv1rjuXT2ANT7rAmhJrOoQpqhTGwB0aPFsz00/wqFQVQVGzPQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.30" + "@budibase/backend-core" "2.5.6-alpha.31" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.30" + "@budibase/types" "2.5.6-alpha.31" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 785b6f50ae7619bf9fcc82389e7635697ae7c399 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 26 Apr 2023 14:53:31 +0100 Subject: [PATCH 107/521] Removed console debugging --- .../builder/src/pages/builder/portal/users/users/index.svelte | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte index 0c69e2c213..19beb67773 100644 --- a/packages/builder/src/pages/builder/portal/users/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte @@ -128,9 +128,6 @@ }) } $: parsedInvites = invitesToSchema(pendingInvites) - $: console.log("parsed invites ", parsedInvites) - // $: console.log(pendingInvites) - $: console.log(enrichedUsers) const updateFetch = email => { fetch.update({ From 5226385367cd9ff353dee66c61244acf229f0870 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Wed, 26 Apr 2023 15:51:25 +0100 Subject: [PATCH 108/521] Change integration count assertion --- qa-core/src/internal-api/api/apis/IntegrationsAPI.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts b/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts index b42b999825..2478823bfa 100644 --- a/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts +++ b/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts @@ -12,7 +12,7 @@ export default class IntegrationsAPI { const [response, json] = await this.client.get(`/integrations`) expect(response).toHaveStatusCode(200) const integrationsCount = Object.keys(json).length - expect(integrationsCount).toBe(16) + expect(integrationsCount).toBeGreaterThan(0) return [response, json] } } From f6a0a664378ad14490107a2dfc119c839568315d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 14:58:55 +0000 Subject: [PATCH 109/521] v2.5.6-alpha.33 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index a542a51851..00f91b58b3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 96f16747e0..739d441452 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.32", + "@budibase/types": "2.5.6-alpha.33", "@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 7664855326..15dc572cf3 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.32", - "@budibase/string-templates": "2.5.6-alpha.32", + "@budibase/shared-core": "2.5.6-alpha.33", + "@budibase/string-templates": "2.5.6-alpha.33", "@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 3159400080..b436b72f16 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.32", - "@budibase/frontend-core": "2.5.6-alpha.32", - "@budibase/shared-core": "2.5.6-alpha.32", - "@budibase/string-templates": "2.5.6-alpha.32", + "@budibase/bbui": "2.5.6-alpha.33", + "@budibase/frontend-core": "2.5.6-alpha.33", + "@budibase/shared-core": "2.5.6-alpha.33", + "@budibase/string-templates": "2.5.6-alpha.33", "@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 f3ebc3beb9..9f49d8188f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.32", - "@budibase/string-templates": "2.5.6-alpha.32", - "@budibase/types": "2.5.6-alpha.32", + "@budibase/backend-core": "2.5.6-alpha.33", + "@budibase/string-templates": "2.5.6-alpha.33", + "@budibase/types": "2.5.6-alpha.33", "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 69d38ed1c3..e0ecde8164 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.32", - "@budibase/frontend-core": "2.5.6-alpha.32", - "@budibase/shared-core": "2.5.6-alpha.32", - "@budibase/string-templates": "2.5.6-alpha.32", - "@budibase/types": "2.5.6-alpha.32", + "@budibase/bbui": "2.5.6-alpha.33", + "@budibase/frontend-core": "2.5.6-alpha.33", + "@budibase/shared-core": "2.5.6-alpha.33", + "@budibase/string-templates": "2.5.6-alpha.33", + "@budibase/types": "2.5.6-alpha.33", "@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 70cec3f9e0..586522bcdb 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.32", - "@budibase/shared-core": "2.5.6-alpha.32", + "@budibase/bbui": "2.5.6-alpha.33", + "@budibase/shared-core": "2.5.6-alpha.33", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c38dedec7d..1a18bc9411 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 1bc50f61d6..2f2fc63180 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.32", + "version": "2.5.6-alpha.33", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.32", - "@budibase/client": "2.5.6-alpha.32", + "@budibase/backend-core": "2.5.6-alpha.33", + "@budibase/client": "2.5.6-alpha.33", "@budibase/pro": "2.5.6-alpha.32", - "@budibase/shared-core": "2.5.6-alpha.32", - "@budibase/string-templates": "2.5.6-alpha.32", - "@budibase/types": "2.5.6-alpha.32", + "@budibase/shared-core": "2.5.6-alpha.33", + "@budibase/string-templates": "2.5.6-alpha.33", + "@budibase/types": "2.5.6-alpha.33", "@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 9b9eb21db1..a9c40ed23c 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.32" + "@budibase/types": "2.5.6-alpha.33" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 8ac9d477b9..ba7c279deb 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "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 3a4bcd9efa..46c7520783 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "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 77594a9896..e1a3e89243 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.32", + "version": "2.5.6-alpha.33", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.32", + "@budibase/backend-core": "2.5.6-alpha.33", "@budibase/pro": "2.5.6-alpha.32", - "@budibase/string-templates": "2.5.6-alpha.32", - "@budibase/types": "2.5.6-alpha.32", + "@budibase/string-templates": "2.5.6-alpha.33", + "@budibase/types": "2.5.6-alpha.33", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 2119ef36bdb2a81bfbfab9aafca7a09dd4b6d738 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 15:00:25 +0000 Subject: [PATCH 110/521] Update pro version to 2.5.6-alpha.33 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 2f2fc63180..a9872dbbc9 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.33", "@budibase/client": "2.5.6-alpha.33", - "@budibase/pro": "2.5.6-alpha.32", + "@budibase/pro": "2.5.6-alpha.33", "@budibase/shared-core": "2.5.6-alpha.33", "@budibase/string-templates": "2.5.6-alpha.33", "@budibase/types": "2.5.6-alpha.33", diff --git a/packages/worker/package.json b/packages/worker/package.json index e1a3e89243..8fa6f11ca3 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.33", - "@budibase/pro": "2.5.6-alpha.32", + "@budibase/pro": "2.5.6-alpha.33", "@budibase/string-templates": "2.5.6-alpha.33", "@budibase/types": "2.5.6-alpha.33", "@koa/router": "8.0.8", From 44ef27299a79696bb10cd2c860d0f6bae4f64fe5 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 16:04:14 +0100 Subject: [PATCH 111/521] Update grid keyboard handling to bring invalid origin consideration to be highest precedence --- .../grid/overlays/KeyboardManager.svelte | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte index e0e842dc16..f0f56118d9 100644 --- a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte +++ b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte @@ -15,8 +15,22 @@ selectedRows, } = getContext("grid") + const ignoredOriginSelectors = [ + ".spectrum-Modal", + "#builder-side-panel-container", + ] + // Global key listener which intercepts all key events const handleKeyDown = e => { + // Avoid processing events sourced from certain origins + if (e.target?.closest) { + for (let selector of ignoredOriginSelectors) { + if (e.target.closest(selector)) { + return + } + } + } + // If nothing selected avoid processing further key presses if (!$focusedCellId) { if (e.key === "Tab" || e.key?.startsWith("Arrow")) { @@ -60,11 +74,6 @@ return } } - - // Avoid processing events sourced from modals - if (e.target?.closest?.(".spectrum-Modal")) { - return - } e.preventDefault() // Handle the key ourselves From 4f8e293dc9dec147d66de0fb4e0703f52c472346 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 26 Apr 2023 16:42:27 +0100 Subject: [PATCH 112/521] Refresh pending invites after inviting a new user in the portal user menu --- .../builder/src/pages/builder/portal/users/users/index.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte index 19beb67773..ff5ad2356e 100644 --- a/packages/builder/src/pages/builder/portal/users/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte @@ -162,6 +162,7 @@ })) try { inviteUsersResponse = await users.invite(payload) + pendingInvites = await users.getInvites() inviteConfirmationModal.show() } catch (error) { notifications.error("Error inviting user") From 6e795064454d774eb7e7d8e788adbcb842abe4ca Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Wed, 26 Apr 2023 16:45:00 +0100 Subject: [PATCH 113/521] Fix failing test --- packages/server/src/integration-test/postgres.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts index 36285e2831..78075b4e54 100644 --- a/packages/server/src/integration-test/postgres.spec.ts +++ b/packages/server/src/integration-test/postgres.spec.ts @@ -349,7 +349,7 @@ describe("row api - postgres", () => { }, plus: true, source: "POSTGRES", - type: "datasource", + type: "datasource_plus", _id: expect.any(String), _rev: expect.any(String), createdAt: expect.any(String), From aad034e53e1bf7f980f67c3cba87e3e0efa33a10 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 16:16:22 +0000 Subject: [PATCH 114/521] v2.5.6-alpha.34 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 00f91b58b3..2f6f845d3e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 739d441452..ef86096a60 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.33", + "@budibase/types": "2.5.6-alpha.34", "@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 15dc572cf3..3f85234fc5 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.33", - "@budibase/string-templates": "2.5.6-alpha.33", + "@budibase/shared-core": "2.5.6-alpha.34", + "@budibase/string-templates": "2.5.6-alpha.34", "@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 b436b72f16..aced0ecd59 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.33", - "@budibase/frontend-core": "2.5.6-alpha.33", - "@budibase/shared-core": "2.5.6-alpha.33", - "@budibase/string-templates": "2.5.6-alpha.33", + "@budibase/bbui": "2.5.6-alpha.34", + "@budibase/frontend-core": "2.5.6-alpha.34", + "@budibase/shared-core": "2.5.6-alpha.34", + "@budibase/string-templates": "2.5.6-alpha.34", "@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 9f49d8188f..069398aeef 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.33", - "@budibase/string-templates": "2.5.6-alpha.33", - "@budibase/types": "2.5.6-alpha.33", + "@budibase/backend-core": "2.5.6-alpha.34", + "@budibase/string-templates": "2.5.6-alpha.34", + "@budibase/types": "2.5.6-alpha.34", "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 e0ecde8164..39d83f9c01 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.33", - "@budibase/frontend-core": "2.5.6-alpha.33", - "@budibase/shared-core": "2.5.6-alpha.33", - "@budibase/string-templates": "2.5.6-alpha.33", - "@budibase/types": "2.5.6-alpha.33", + "@budibase/bbui": "2.5.6-alpha.34", + "@budibase/frontend-core": "2.5.6-alpha.34", + "@budibase/shared-core": "2.5.6-alpha.34", + "@budibase/string-templates": "2.5.6-alpha.34", + "@budibase/types": "2.5.6-alpha.34", "@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 586522bcdb..3d1320316a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.33", - "@budibase/shared-core": "2.5.6-alpha.33", + "@budibase/bbui": "2.5.6-alpha.34", + "@budibase/shared-core": "2.5.6-alpha.34", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1a18bc9411..168f0c3e5f 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a9872dbbc9..0769470aec 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.33", + "version": "2.5.6-alpha.34", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.33", - "@budibase/client": "2.5.6-alpha.33", + "@budibase/backend-core": "2.5.6-alpha.34", + "@budibase/client": "2.5.6-alpha.34", "@budibase/pro": "2.5.6-alpha.33", - "@budibase/shared-core": "2.5.6-alpha.33", - "@budibase/string-templates": "2.5.6-alpha.33", - "@budibase/types": "2.5.6-alpha.33", + "@budibase/shared-core": "2.5.6-alpha.34", + "@budibase/string-templates": "2.5.6-alpha.34", + "@budibase/types": "2.5.6-alpha.34", "@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 a9c40ed23c..9359e7ba59 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.33" + "@budibase/types": "2.5.6-alpha.34" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ba7c279deb..fd537f8b0f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "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 46c7520783..631c475d85 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "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 8fa6f11ca3..5cca48a05e 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.33", + "version": "2.5.6-alpha.34", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.33", + "@budibase/backend-core": "2.5.6-alpha.34", "@budibase/pro": "2.5.6-alpha.33", - "@budibase/string-templates": "2.5.6-alpha.33", - "@budibase/types": "2.5.6-alpha.33", + "@budibase/string-templates": "2.5.6-alpha.34", + "@budibase/types": "2.5.6-alpha.34", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 34b0a1fa2da71ebf6059b62f5758169575dd7a3a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 16:17:58 +0000 Subject: [PATCH 115/521] Update pro version to 2.5.6-alpha.34 --- 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 0769470aec..df88362fc1 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.34", "@budibase/client": "2.5.6-alpha.34", - "@budibase/pro": "2.5.6-alpha.33", + "@budibase/pro": "2.5.6-alpha.34", "@budibase/shared-core": "2.5.6-alpha.34", "@budibase/string-templates": "2.5.6-alpha.34", "@budibase/types": "2.5.6-alpha.34", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5cca48a05e..d57547c9df 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.34", - "@budibase/pro": "2.5.6-alpha.33", + "@budibase/pro": "2.5.6-alpha.34", "@budibase/string-templates": "2.5.6-alpha.34", "@budibase/types": "2.5.6-alpha.34", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 404952f815..c8adee7527 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.32": - version "2.5.6-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.32.tgz#6d52da231efcacbb163a5af0cfe8284199ff659e" - integrity sha512-XzM55VcxpxTXCxYhLUOYvYqlCAPRPASJBbNonuRV6qUtXZxE5xSSEDnHQehhD8TrNP3QQ94DlCJ5DQCm/f3yJQ== +"@budibase/pro@2.5.6-alpha.33": + version "2.5.6-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.33.tgz#15666778fe90f0b2ef8435b91e20e347f96576d3" + integrity sha512-UJZhErUjj+J4d8X+NDU453VvpT/THAaK8r+0QAHxjBB9xiN5XynXb2SxpOpbkR51WQlURpULtwnbqmWiB0+DFA== dependencies: - "@budibase/backend-core" "2.5.6-alpha.32" + "@budibase/backend-core" "2.5.6-alpha.33" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.32" + "@budibase/types" "2.5.6-alpha.33" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 09ec898a4d2d22be181c8b2725d9817087922a27 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 18:43:56 +0100 Subject: [PATCH 116/521] Update readonly cell border to be gray --- .../frontend-core/src/components/grid/cells/GridCell.svelte | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/frontend-core/src/components/grid/cells/GridCell.svelte b/packages/frontend-core/src/components/grid/cells/GridCell.svelte index dfc53f6f0c..6589c18d07 100644 --- a/packages/frontend-core/src/components/grid/cells/GridCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/GridCell.svelte @@ -117,6 +117,9 @@ .cell.error { --cell-color: var(--spectrum-global-color-red-500); } + .cell.readonly { + --cell-color: var(--spectrum-global-color-gray-600); + } .cell:not(.focused) { user-select: none; } From 78c50df4bdc566c001bc4c236f927fe0a2ab0a59 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 18:52:16 +0100 Subject: [PATCH 117/521] Add overlay to autocolumns when creating rows --- .../src/components/grid/cells/DataCell.svelte | 1 + .../src/components/grid/layout/NewRow.svelte | 23 ++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/cells/DataCell.svelte b/packages/frontend-core/src/components/grid/cells/DataCell.svelte index 59e81b3081..0aa0cd54f4 100644 --- a/packages/frontend-core/src/components/grid/cells/DataCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/DataCell.svelte @@ -87,4 +87,5 @@ {invertX} {contentLines} /> + diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte index 54fef78301..48c5dcec69 100644 --- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte @@ -181,7 +181,11 @@ rowIdx={0} invertX={columnIdx >= $columnHorizontalInversionIndex} {invertY} - /> + > + {#if column?.schema?.autocolumn} +
Can't edit auto column
+ {/if} + {/key} {/each} @@ -262,4 +266,21 @@ width: 0; display: flex; } + + /* Readonly cell overlay */ + .readonly { + position: absolute; + top: 0; + left: 0; + height: var(--row-height); + width: 100%; + padding: var(--cell-padding); + font-style: italic; + color: var(--spectrum-global-color-gray-600); + z-index: 1; + user-select: none; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } From 5b03ce05666c89e5e71d0ac039c5d2eb013d7434 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 19:23:06 +0100 Subject: [PATCH 118/521] Add loading state to new row component --- .../src/components/grid/layout/NewRow.svelte | 49 +++++++++++++++---- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte index 48c5dcec69..607dc9e1f0 100644 --- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte @@ -27,13 +27,14 @@ columnHorizontalInversionIndex, } = getContext("grid") + let visible = false let isAdding = false let newRow = {} let offset = 0 $: firstColumn = $stickyColumn || $renderedColumns[0] $: width = GutterWidth + ($stickyColumn?.width || 0) - $: $tableId, (isAdding = false) + $: $tableId, (visible = false) $: invertY = shouldInvertY(offset, $rowVerticalInversionIndex, $renderedRows) const shouldInvertY = (offset, inversionIndex, rows) => { @@ -45,7 +46,8 @@ const addRow = async () => { // Blur the active cell and tick to let final value updates propagate - $focusedCellAPI?.blur() + isAdding = true + $focusedCellId = null await tick() // Create row @@ -60,17 +62,19 @@ $focusedCellId = `${savedRow._id}-${firstColumn.name}` } } + isAdding = false } const clear = () => { isAdding = false + visible = false $focusedCellId = null $hoveredRowId = null document.removeEventListener("keydown", handleKeyPress) } const startAdding = async () => { - if (isAdding) { + if (visible) { return } @@ -95,7 +99,7 @@ // Update state and select initial cell newRow = {} - isAdding = true + visible = true $hoveredRowId = NewRowID if (firstColumn) { $focusedCellId = `${NewRowID}-${firstColumn.name}` @@ -115,7 +119,7 @@ } const handleKeyPress = e => { - if (!isAdding) { + if (!visible) { return } if (e.key === "Escape") { @@ -137,7 +141,7 @@ -{#if isAdding} +{#if visible}
0} @@ -148,6 +152,9 @@
+ {#if isAdding} +
+ {/if} {#if $stickyColumn} {@const cellId = `${NewRowID}-${$stickyColumn.name}`} @@ -161,7 +168,14 @@ {updateValue} rowIdx={0} {invertY} - /> + > + {#if $stickyColumn?.schema?.autocolumn} +
Can't edit auto column
+ {/if} + {#if isAdding} +
+ {/if} + {/if}
@@ -183,7 +197,10 @@ {invertY} > {#if column?.schema?.autocolumn} -
Can't edit auto column
+
Can't edit auto column
+ {/if} + {#if isAdding} +
{/if} {/key} @@ -192,7 +209,7 @@
- +
@@ -268,7 +285,7 @@ } /* Readonly cell overlay */ - .readonly { + .readonly-overlay { position: absolute; top: 0; left: 0; @@ -283,4 +300,16 @@ white-space: nowrap; text-overflow: ellipsis; } + + /* Overlay while row is being added */ + .loading-overlay { + position: absolute; + top: 0; + left: 0; + height: var(--row-height); + width: 100%; + z-index: 1; + background: var(--spectrum-global-color-gray-400); + opacity: 0.25; + } From 972e2257b76bd60dc20424c8f9c77de86f772ac2 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 27 Apr 2023 08:25:53 +0100 Subject: [PATCH 119/521] [draft] Pricing/fixes (#10424) * Fix qa core suite * Update package.json * Lint * Handle conflict on account metadata * Fix issue adding users via csv import when on paid plan * Fix user invites * Lint --- .../users/_components/ImportUsersModal.svelte | 2 +- packages/builder/src/stores/portal/users.js | 14 ++++++++------ .../worker/src/api/controllers/global/users.ts | 2 ++ packages/worker/src/sdk/accounts/metadata.ts | 13 +++++++++++-- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte index be0023ec21..b35c6c998f 100644 --- a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte @@ -25,7 +25,7 @@ $: invalidEmails = [] $: userCount = $licensing.userCount + userEmails.length - $: willExceed = userCount > $licensing.userLimit + $: willExceed = licensing.willExceedUserLimit(userCount) $: importDisabled = !userEmails.length || !validEmails(userEmails) || !usersRole || willExceed diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js index d223239f67..898d47c0e2 100644 --- a/packages/builder/src/stores/portal/users.js +++ b/packages/builder/src/stores/portal/users.js @@ -114,11 +114,13 @@ export function createUsersStore() { const getUserRole = ({ admin, builder }) => admin?.global ? "admin" : builder?.global ? "developer" : "appUser" - const refreshUsage = fn => async args => { - const response = await fn(args) - await licensing.setQuotaUsage() - return response - } + const refreshUsage = + fn => + async (...args) => { + const response = await fn(...args) + await licensing.setQuotaUsage() + return response + } return { subscribe, @@ -133,7 +135,7 @@ export function createUsersStore() { updateInvite, getUserCountByApp, // any operation that adds or deletes users - acceptInvite: refreshUsage(acceptInvite), + acceptInvite, create: refreshUsage(create), save: refreshUsage(save), bulkDelete: refreshUsage(bulkDelete), diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index 8db2d29691..d9ebc87517 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -424,7 +424,9 @@ export const inviteAccept = async ( if (err.code === ErrorCode.USAGE_LIMIT_EXCEEDED) { // explicitly re-throw limit exceeded errors ctx.throw(400, err) + return } + console.warn("Error inviting user", err) ctx.throw(400, "Unable to create new user, invitation invalid.") } } diff --git a/packages/worker/src/sdk/accounts/metadata.ts b/packages/worker/src/sdk/accounts/metadata.ts index 64065e8b78..11ab069839 100644 --- a/packages/worker/src/sdk/accounts/metadata.ts +++ b/packages/worker/src/sdk/accounts/metadata.ts @@ -18,8 +18,17 @@ export const saveMetadata = async ( if (existing) { metadata._rev = existing._rev } - const res = await db.put(metadata) - metadata._rev = res.rev + try { + const res = await db.put(metadata) + metadata._rev = res.rev + } catch (e: any) { + // account can be updated frequently + // ignore 409 + if (e.status !== 409) { + throw e + } + } + return metadata }) } From f8d4e95fbd6ee570a07eeff8359c2d9c758dd971 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 07:34:19 +0000 Subject: [PATCH 120/521] v2.5.6-alpha.35 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 2f6f845d3e..77b105ce3c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ef86096a60..2af6de59e5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.34", + "@budibase/types": "2.5.6-alpha.35", "@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 3f85234fc5..fe0dfdc2d5 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.34", - "@budibase/string-templates": "2.5.6-alpha.34", + "@budibase/shared-core": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.35", "@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 aced0ecd59..6983b365db 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.34", - "@budibase/frontend-core": "2.5.6-alpha.34", - "@budibase/shared-core": "2.5.6-alpha.34", - "@budibase/string-templates": "2.5.6-alpha.34", + "@budibase/bbui": "2.5.6-alpha.35", + "@budibase/frontend-core": "2.5.6-alpha.35", + "@budibase/shared-core": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.35", "@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 069398aeef..94bf0825ad 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.34", - "@budibase/string-templates": "2.5.6-alpha.34", - "@budibase/types": "2.5.6-alpha.34", + "@budibase/backend-core": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/types": "2.5.6-alpha.35", "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 39d83f9c01..2d70e5e847 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.34", - "@budibase/frontend-core": "2.5.6-alpha.34", - "@budibase/shared-core": "2.5.6-alpha.34", - "@budibase/string-templates": "2.5.6-alpha.34", - "@budibase/types": "2.5.6-alpha.34", + "@budibase/bbui": "2.5.6-alpha.35", + "@budibase/frontend-core": "2.5.6-alpha.35", + "@budibase/shared-core": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/types": "2.5.6-alpha.35", "@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 3d1320316a..2ec43faef0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.34", - "@budibase/shared-core": "2.5.6-alpha.34", + "@budibase/bbui": "2.5.6-alpha.35", + "@budibase/shared-core": "2.5.6-alpha.35", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 168f0c3e5f..7bbb57aa92 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index df88362fc1..07b5a04606 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.34", + "version": "2.5.6-alpha.35", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.34", - "@budibase/client": "2.5.6-alpha.34", + "@budibase/backend-core": "2.5.6-alpha.35", + "@budibase/client": "2.5.6-alpha.35", "@budibase/pro": "2.5.6-alpha.34", - "@budibase/shared-core": "2.5.6-alpha.34", - "@budibase/string-templates": "2.5.6-alpha.34", - "@budibase/types": "2.5.6-alpha.34", + "@budibase/shared-core": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/types": "2.5.6-alpha.35", "@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 9359e7ba59..e821537eac 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.34" + "@budibase/types": "2.5.6-alpha.35" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index fd537f8b0f..023fc5d17a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "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 631c475d85..f284179e81 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "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 d57547c9df..e33747e3c8 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.34", + "version": "2.5.6-alpha.35", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.34", + "@budibase/backend-core": "2.5.6-alpha.35", "@budibase/pro": "2.5.6-alpha.34", - "@budibase/string-templates": "2.5.6-alpha.34", - "@budibase/types": "2.5.6-alpha.34", + "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/types": "2.5.6-alpha.35", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d6e5647b89a4e4f9bf8f63ddd9bf79aa0fe816ec Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 07:36:01 +0000 Subject: [PATCH 121/521] Update pro version to 2.5.6-alpha.35 --- 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 07b5a04606..a131a5dd31 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.35", "@budibase/client": "2.5.6-alpha.35", - "@budibase/pro": "2.5.6-alpha.34", + "@budibase/pro": "2.5.6-alpha.35", "@budibase/shared-core": "2.5.6-alpha.35", "@budibase/string-templates": "2.5.6-alpha.35", "@budibase/types": "2.5.6-alpha.35", diff --git a/packages/worker/package.json b/packages/worker/package.json index e33747e3c8..01662722ce 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.35", - "@budibase/pro": "2.5.6-alpha.34", + "@budibase/pro": "2.5.6-alpha.35", "@budibase/string-templates": "2.5.6-alpha.35", "@budibase/types": "2.5.6-alpha.35", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index c8adee7527..9020feb28a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.33": - version "2.5.6-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.33.tgz#15666778fe90f0b2ef8435b91e20e347f96576d3" - integrity sha512-UJZhErUjj+J4d8X+NDU453VvpT/THAaK8r+0QAHxjBB9xiN5XynXb2SxpOpbkR51WQlURpULtwnbqmWiB0+DFA== +"@budibase/pro@2.5.6-alpha.34": + version "2.5.6-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.34.tgz#b992dd7830479e1e869c03fedc11b552d0cea2ca" + integrity sha512-mK/gVZuR+3USPQidTq+xSm0H5VRX2/DgWNOoDp2b8XzrHeTDPV/Qy7yJd3Cxidemk25+ddwbU/VRrPMa+6PKSw== dependencies: - "@budibase/backend-core" "2.5.6-alpha.33" + "@budibase/backend-core" "2.5.6-alpha.34" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.33" + "@budibase/types" "2.5.6-alpha.34" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From d4b9531b95b375fb36ff3312bd0730f2ac608c95 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Apr 2023 09:02:49 +0100 Subject: [PATCH 122/521] Add keyboard shortcut indicators for adding new rows --- .../grid/layout/KeyboardShortcut.svelte | 53 +++++++++++++++++++ .../src/components/grid/layout/NewRow.svelte | 23 +++++++- .../grid/layout/StickyColumn.svelte | 5 +- 3 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 packages/frontend-core/src/components/grid/layout/KeyboardShortcut.svelte diff --git a/packages/frontend-core/src/components/grid/layout/KeyboardShortcut.svelte b/packages/frontend-core/src/components/grid/layout/KeyboardShortcut.svelte new file mode 100644 index 0000000000..5024a24ea7 --- /dev/null +++ b/packages/frontend-core/src/components/grid/layout/KeyboardShortcut.svelte @@ -0,0 +1,53 @@ + + +
+ {#each parsedKeys as key} +
+ {key} +
+ {/each} +
+ + diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte index 607dc9e1f0..71c390c946 100644 --- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte @@ -7,6 +7,7 @@ import { GutterWidth } from "../lib/constants" import { NewRowID } from "../lib/constants" import GutterCell from "../cells/GutterCell.svelte" + import KeyboardShortcut from "./KeyboardShortcut.svelte" const { hoveredRowId, @@ -209,8 +210,18 @@
- - + +
{/if} @@ -261,6 +272,14 @@ top: calc(var(--row-height) + var(--offset) + 24px); left: var(--gutter-width); } + .button-with-keys { + display: flex; + gap: 6px; + align-items: center; + } + .button-with-keys :global(> div) { + padding-top: 2px; + } /* Sticky column styles */ .sticky-column { diff --git a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte index 44be0777cf..6301112110 100644 --- a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte +++ b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte @@ -7,6 +7,7 @@ import HeaderCell from "../cells/HeaderCell.svelte" import { GutterWidth, BlankRowID } from "../lib/constants" import GutterCell from "../cells/GutterCell.svelte" + import KeyboardShortcut from "./KeyboardShortcut.svelte" const { rows, @@ -105,7 +106,9 @@ + > + + {/if}
{/if} From e239d1e5596e9b8aa194939ba0b1f648bb79d647 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Apr 2023 09:55:59 +0100 Subject: [PATCH 123/521] Use 'high-low' nomenclature for sorting on numeric columns in header cells --- .../src/components/grid/cells/HeaderCell.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte index 165711c51f..72b0ad0ff1 100644 --- a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte @@ -37,6 +37,8 @@ $: sortedBy = column.name === $sort.column $: canMoveLeft = orderable && idx > 0 $: canMoveRight = orderable && idx < $renderedColumns.length - 1 + $: ascendingLabel = column.schema?.type === "number" ? "low-high" : "A-Z" + $: descendingLabel = column.schema?.type === "number" ? "high-low" : "Z-A" const editColumn = () => { dispatch("edit-column", column.schema) @@ -179,14 +181,14 @@ on:click={sortAscending} disabled={column.name === $sort.column && $sort.order === "ascending"} > - Sort A-Z + Sort {ascendingLabel} - Sort Z-A + Sort {descendingLabel} Move left From 46b079497aa86a119617770d4664ebc34497c5a6 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Apr 2023 10:03:23 +0100 Subject: [PATCH 124/521] Use 'high-low' nomenclature for numerical columns in grid sort button --- .../grid/controls/SortButton.svelte | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/packages/frontend-core/src/components/grid/controls/SortButton.svelte b/packages/frontend-core/src/components/grid/controls/SortButton.svelte index 26eba050bf..bd75249216 100644 --- a/packages/frontend-core/src/components/grid/controls/SortButton.svelte +++ b/packages/frontend-core/src/components/grid/controls/SortButton.svelte @@ -3,16 +3,13 @@ import { ActionButton, Popover, Select } from "@budibase/bbui" const { sort, columns, stickyColumn } = getContext("grid") - const orderOptions = [ - { label: "A-Z", value: "ascending" }, - { label: "Z-A", value: "descending" }, - ] let open = false let anchor $: columnOptions = getColumnOptions($stickyColumn, $columns) $: checkValidSortColumn($sort.column, $stickyColumn, $columns) + $: orderOptions = getOrderOptions($sort.column, columnOptions) const getColumnOptions = (stickyColumn, columns) => { let options = [] @@ -20,6 +17,7 @@ options.push({ label: stickyColumn.label || stickyColumn.name, value: stickyColumn.name, + type: stickyColumn.schema?.type, }) } return [ @@ -27,10 +25,25 @@ ...columns.map(col => ({ label: col.label || col.name, value: col.name, + type: col.schema?.type, })), ] } + const getOrderOptions = (column, columnOptions) => { + const type = columnOptions.find(col => col.value === column)?.type + return [ + { + label: type === "number" ? "Low-high" : "A-Z", + value: "ascending", + }, + { + label: type === "number" ? "High-low" : "Z-A", + value: "descending", + }, + ] + } + const updateSortColumn = e => { sort.update(state => ({ ...state, From ead89bf0bf32f84ca9c4ef963857ed2b0297ee3f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 09:31:32 +0000 Subject: [PATCH 125/521] v2.5.6-alpha.36 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 77b105ce3c..6633dc9eee 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 2af6de59e5..fedb763e75 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/types": "2.5.6-alpha.36", "@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 fe0dfdc2d5..ca17df6ce2 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", "@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 6983b365db..3d2a05e998 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.35", - "@budibase/frontend-core": "2.5.6-alpha.35", - "@budibase/shared-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/bbui": "2.5.6-alpha.36", + "@budibase/frontend-core": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", "@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 94bf0825ad..6a2f7bf373 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/backend-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.36", "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 2d70e5e847..080d67e780 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.35", - "@budibase/frontend-core": "2.5.6-alpha.35", - "@budibase/shared-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/bbui": "2.5.6-alpha.36", + "@budibase/frontend-core": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.36", "@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 2ec43faef0..fabc8b265c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.35", - "@budibase/shared-core": "2.5.6-alpha.35", + "@budibase/bbui": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.36", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7bbb57aa92..77bee658f9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a131a5dd31..a66729df54 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.35", + "version": "2.5.6-alpha.36", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.35", - "@budibase/client": "2.5.6-alpha.35", + "@budibase/backend-core": "2.5.6-alpha.36", + "@budibase/client": "2.5.6-alpha.36", "@budibase/pro": "2.5.6-alpha.35", - "@budibase/shared-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.36", "@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 e821537eac..0cbf9fe2da 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.35" + "@budibase/types": "2.5.6-alpha.36" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 023fc5d17a..0818e222f2 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "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 f284179e81..bb44434d1f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "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 01662722ce..1a23c490a7 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.35", + "version": "2.5.6-alpha.36", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.35", + "@budibase/backend-core": "2.5.6-alpha.36", "@budibase/pro": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.36", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 1b815c363a2497bc026c59f9e134c851fad47c8c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 09:32:55 +0000 Subject: [PATCH 126/521] Update pro version to 2.5.6-alpha.36 --- 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 a66729df54..4390ea3882 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.36", "@budibase/client": "2.5.6-alpha.36", - "@budibase/pro": "2.5.6-alpha.35", + "@budibase/pro": "2.5.6-alpha.36", "@budibase/shared-core": "2.5.6-alpha.36", "@budibase/string-templates": "2.5.6-alpha.36", "@budibase/types": "2.5.6-alpha.36", diff --git a/packages/worker/package.json b/packages/worker/package.json index 1a23c490a7..4e27f3e73c 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.36", - "@budibase/pro": "2.5.6-alpha.35", + "@budibase/pro": "2.5.6-alpha.36", "@budibase/string-templates": "2.5.6-alpha.36", "@budibase/types": "2.5.6-alpha.36", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 9020feb28a..806073b5a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.34": - version "2.5.6-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.34.tgz#b992dd7830479e1e869c03fedc11b552d0cea2ca" - integrity sha512-mK/gVZuR+3USPQidTq+xSm0H5VRX2/DgWNOoDp2b8XzrHeTDPV/Qy7yJd3Cxidemk25+ddwbU/VRrPMa+6PKSw== +"@budibase/pro@2.5.6-alpha.35": + version "2.5.6-alpha.35" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.35.tgz#b065c39f23829db191ced3a583285bcecf7c1dde" + integrity sha512-YxKCRSkLprOK9ipu+R9vg9LIumas4zM0ZTTPyL+0NRDhJRwINRQziJIkakNaIHPLEPadVQFNrBY33HOS3hzdZg== dependencies: - "@budibase/backend-core" "2.5.6-alpha.34" + "@budibase/backend-core" "2.5.6-alpha.35" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.34" + "@budibase/types" "2.5.6-alpha.35" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 5363693ac305bb28af6a34282f1525f45e050d30 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 27 Apr 2023 11:36:52 +0100 Subject: [PATCH 127/521] Removing automation logs from app exports as they are not useful - they take up space and the imported app won't have ran any automations yet. I have added it as a flag so that this does not affect backups (as you would want to maintain logs for backups). --- packages/server/src/db/utils.ts | 1 + .../server/src/sdk/app/backups/exports.ts | 23 ++++++++++++++----- yarn.lock | 12 +++++----- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/packages/server/src/db/utils.ts b/packages/server/src/db/utils.ts index 50341e4abc..e08392c3a1 100644 --- a/packages/server/src/db/utils.ts +++ b/packages/server/src/db/utils.ts @@ -27,6 +27,7 @@ export const isProdAppID = dbCore.isProdAppID export const USER_METDATA_PREFIX = `${DocumentType.ROW}${SEPARATOR}${dbCore.InternalTable.USER_METADATA}${SEPARATOR}` export const LINK_USER_METADATA_PREFIX = `${DocumentType.LINK}${SEPARATOR}${dbCore.InternalTable.USER_METADATA}${SEPARATOR}` export const TABLE_ROW_PREFIX = `${DocumentType.ROW}${SEPARATOR}${DocumentType.TABLE}` +export const AUTOMATION_LOG_PREFIX = `${DocumentType.AUTOMATION_LOG}${SEPARATOR}` export const ViewName = dbCore.ViewName export const InternalTables = dbCore.InternalTable export const UNICODE_MAX = dbCore.UNICODE_MAX diff --git a/packages/server/src/sdk/app/backups/exports.ts b/packages/server/src/sdk/app/backups/exports.ts index 27a907fceb..57342e7462 100644 --- a/packages/server/src/sdk/app/backups/exports.ts +++ b/packages/server/src/sdk/app/backups/exports.ts @@ -3,6 +3,7 @@ import { budibaseTempDir } from "../../../utilities/budibaseDir" import { streamFile, createTempFolder } from "../../../utilities/fileSystem" import { ObjectStoreBuckets } from "../../../constants" import { + AUTOMATION_LOG_PREFIX, LINK_USER_METADATA_PREFIX, TABLE_ROW_PREFIX, USER_METDATA_PREFIX, @@ -20,11 +21,15 @@ const uuid = require("uuid/v4") const tar = require("tar") const MemoryStream = require("memorystream") -type ExportOpts = { +interface DBDumpOpts { filter?: any exportPath?: string +} + +interface ExportOpts extends DBDumpOpts { tar?: boolean excludeRows?: boolean + excludeLogs?: boolean } function tarFilesToTmp(tmpDir: string, files: string[]) { @@ -49,7 +54,7 @@ function tarFilesToTmp(tmpDir: string, files: string[]) { * a filter function or the name of the export. * @return {*} either a readable stream or a string */ -export async function exportDB(dbName: string, opts: ExportOpts = {}) { +export async function exportDB(dbName: string, opts: DBDumpOpts = {}) { const exportOpts = { filter: opts?.filter, batch_size: 1000, @@ -76,11 +81,14 @@ export async function exportDB(dbName: string, opts: ExportOpts = {}) { }) } -function defineFilter(excludeRows?: boolean) { +function defineFilter(excludeRows?: boolean, excludeLogs?: boolean) { const ids = [USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX] if (excludeRows) { ids.push(TABLE_ROW_PREFIX) } + if (excludeLogs) { + ids.push(AUTOMATION_LOG_PREFIX) + } return (doc: any) => !ids.map(key => doc._id.includes(key)).reduce((prev, curr) => prev || curr) } @@ -130,8 +138,7 @@ export async function exportApp(appId: string, config?: ExportOpts) { // enforce an export of app DB to the tmp path const dbPath = join(tmpPath, DB_EXPORT_FILE) await exportDB(appId, { - ...config, - filter: defineFilter(config?.excludeRows), + filter: defineFilter(config?.excludeRows, config?.excludeLogs), exportPath: dbPath, }) // if tar requested, return where the tarball is @@ -155,6 +162,10 @@ export async function exportApp(appId: string, config?: ExportOpts) { * @returns {*} a readable stream of the backup which is written in real time */ export async function streamExportApp(appId: string, excludeRows: boolean) { - const tmpPath = await exportApp(appId, { excludeRows, tar: true }) + const tmpPath = await exportApp(appId, { + excludeRows, + excludeLogs: true, + tar: true, + }) return streamFile(tmpPath) } diff --git a/yarn.lock b/yarn.lock index 806073b5a4..fff37f62e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.35": - version "2.5.6-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.35.tgz#b065c39f23829db191ced3a583285bcecf7c1dde" - integrity sha512-YxKCRSkLprOK9ipu+R9vg9LIumas4zM0ZTTPyL+0NRDhJRwINRQziJIkakNaIHPLEPadVQFNrBY33HOS3hzdZg== +"@budibase/pro@2.5.6-alpha.36": + version "2.5.6-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.36.tgz#361afe64b0881ee436a5ef294fb315c05ea94ce6" + integrity sha512-uX1wgOk47aVGl/yIJZiZS8x31sTS6wGDEFv0AMZ2h6rwIp6GwHDGq2/QT6a8hRMsAM4sqr8R2GkyyAG+dm0DGQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.35" + "@budibase/backend-core" "2.5.6-alpha.36" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.35" + "@budibase/types" "2.5.6-alpha.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 5728cf9b2a66e42b7a886c3d6915d7c527069478 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Apr 2023 11:55:03 +0100 Subject: [PATCH 128/521] Add clickoutside handlers to options, long form and relationship cells --- .../src/components/grid/cells/LongFormCell.svelte | 2 ++ .../src/components/grid/cells/OptionsCell.svelte | 3 ++- .../src/components/grid/cells/RelationshipCell.svelte | 10 ++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte b/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte index 00e12dc6a3..886d4ef8b0 100644 --- a/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte @@ -1,5 +1,6 @@ - + From 4093516a0db895c684e448ee9b4ae420b972dbb0 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 27 Apr 2023 12:46:40 +0100 Subject: [PATCH 131/521] Initial commit of filter UX behaviour --- .../_components/BuilderSidePanel.svelte | 44 +++++++++++++++---- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte index 9a6d9ea1d3..b31488e492 100644 --- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte @@ -28,6 +28,10 @@ let inviting = false let searchFocus = false + //Or searching = true? + let filtered = true + $: console.log("filtering enabled ", filtered) + let appInvites = [] let filteredInvites = [] let filteredUsers = [] @@ -52,15 +56,31 @@ } const filterInvites = async query => { - appInvites = await getInvites() - if (!query || query == "") { - filteredInvites = appInvites + if (!prodAppId) { return } - filteredInvites = appInvites.filter(invite => invite.email.includes(query)) + + appInvites = await getInvites() + + //On Focus behaviour + if (!filtered && (!query || query == "")) { + filteredInvites = [...appInvites] + return + } + + filteredInvites = appInvites.filter(invite => { + const inviteInfo = invite.info?.apps + if ((!query || query == "") && inviteInfo && prodAppId) { + return Object.keys(inviteInfo).includes(prodAppId) + } + return invite.email.includes(query) + }) } - $: filterInvites(query) + $: filtered, prodAppId, filterInvites(query) + $: if (searchFocus === true) { + filtered = false + } const usersFetch = fetchData({ API, @@ -351,7 +371,7 @@ onMount(() => { rendered = true - searchFocus = true + // searchFocus = true }) function handleKeyDown(evt) { @@ -417,7 +437,6 @@ autocomplete="off" disabled={inviting} value={query} - autofocus on:input={e => { query = e.target.value.trim() }} @@ -428,16 +447,20 @@ { + if (!filtered) { + filtered = true + } if (!query) { return } query = null userOnboardResponse = null + filtered = true }} > - + @@ -481,6 +504,8 @@
+ + +
{/each} From 8d6c00644a4604938f4e97222a977d2ed64d3105 Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Thu, 27 Apr 2023 13:33:22 +0100 Subject: [PATCH 132/521] Improve Automations Error Message --- packages/builder/src/builderStore/store/automation/index.js | 3 +++ .../AutomationBuilder/FlowChart/TestDataModal.svelte | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/builderStore/store/automation/index.js b/packages/builder/src/builderStore/store/automation/index.js index dc1e2a2cc1..9e5516c512 100644 --- a/packages/builder/src/builderStore/store/automation/index.js +++ b/packages/builder/src/builderStore/store/automation/index.js @@ -147,6 +147,9 @@ const automationActions = store => ({ testData, }) if (!result?.trigger && !result?.steps?.length) { + if (result?.err?.code === "usage_limit_exceeded") { + throw "You have exceeded your automation quota" + } throw "Something went wrong testing your automation" } store.update(state => { diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte index cd170142e4..17d5b35575 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte @@ -52,7 +52,7 @@ await automationStore.actions.test($selectedAutomation, testData) $automationStore.showTestPanel = true } catch (error) { - notifications.error("Error testing automation") + notifications.error(error) } } From e74d4b4ddb3212db11095a7a969957bfc795f5fb Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Thu, 27 Apr 2023 14:17:09 +0100 Subject: [PATCH 133/521] PR Feedback --- packages/client/src/components/app/Button.svelte | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/client/src/components/app/Button.svelte b/packages/client/src/components/app/Button.svelte index 51452de199..a074986342 100644 --- a/packages/client/src/components/app/Button.svelte +++ b/packages/client/src/components/app/Button.svelte @@ -19,12 +19,12 @@ export let active = false const handleOnClick = async () => { - if (handlingOnClick) { - return + handlingOnClick = true + + if (onClick) { + await onClick() } - handlingOnClick = true - await onClick() handlingOnClick = false } @@ -49,7 +49,7 @@
From 20885a708d56969502c4c4505f95a32f3c8eeabd Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 3 May 2023 12:23:21 +0100 Subject: [PATCH 184/521] Feedback updates --- .../_components/BuilderSidePanel.svelte | 40 ++++++------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte index 7341dcd35c..5b35e65ed9 100644 --- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte @@ -28,10 +28,6 @@ let inviting = false let searchFocus = false - // Initially filter entities without app access - // Show all when false - let filterByAppAccess = true - let appInvites = [] let filteredInvites = [] let filteredUsers = [] @@ -62,7 +58,7 @@ appInvites = await getInvites() //On Focus behaviour - if (!filterByAppAccess && (!query || query == "")) { + if (searchFocus && !query) { filteredInvites = appInvites.length > 100 ? appInvites.slice(0, 100) : [...appInvites] return @@ -77,10 +73,7 @@ }) } - $: filterByAppAccess, prodAppId, filterInvites(query) - $: if (searchFocus === true) { - filterByAppAccess = false - } + $: searchFocus, prodAppId, filterInvites(query) const usersFetch = fetchData({ API, @@ -99,9 +92,9 @@ } await usersFetch.update({ query: { - appId: query || !filterByAppAccess ? null : prodAppId, + appId: query || searchFocus ? null : prodAppId, email: query, - paginated: query || !filterByAppAccess ? null : false, + paginated: query || searchFocus ? null : false, }, }) await usersFetch.refresh() @@ -127,12 +120,7 @@ } const debouncedUpdateFetch = Utils.debounce(searchUsers, 250) - $: debouncedUpdateFetch( - query, - $store.builderSidePanel, - loaded, - filterByAppAccess - ) + $: debouncedUpdateFetch(query, $store.builderSidePanel, loaded, searchFocus) const updateAppUser = async (user, role) => { if (!prodAppId) { @@ -208,7 +196,7 @@ const searchGroups = (userGroups, query) => { let filterGroups = - query?.length || !filterByAppAccess + query?.length || searchFocus ? userGroups : getAppGroups(userGroups, prodAppId) return filterGroups @@ -240,7 +228,7 @@ } // Adds the 'role' attribute and sets it to the current app. - $: enrichedGroups = getEnrichedGroups($groups, filterByAppAccess) + $: enrichedGroups = getEnrichedGroups($groups, searchFocus) $: filteredGroups = searchGroups(enrichedGroups, query) $: groupUsers = buildGroupUsers(filteredGroups, filteredUsers) $: allUsers = [...filteredUsers, ...groupUsers] @@ -252,7 +240,7 @@ specific roles for the app. */ const buildGroupUsers = (userGroups, filteredUsers) => { - if (query || !filterByAppAccess) { + if (query || searchFocus) { return [] } // Must exclude users who have explicit privileges @@ -452,20 +440,19 @@ { - if (!filterByAppAccess) { - filterByAppAccess = true + if (searchFocus) { + searchFocus = false } if (!query) { return } query = null userOnboardResponse = null - filterByAppAccess = true }} > - + @@ -509,8 +496,6 @@
- - -
{/each} From 1fcc64154ed7d88dd299e3b114477d45aec81f69 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 3 May 2023 13:14:55 +0000 Subject: [PATCH 185/521] v2.5.6-alpha.45 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 3273f7bce7..cd9b1d8e1d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index e72abc9e9d..cba87923db 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.44", + "@budibase/types": "2.5.6-alpha.45", "@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 68f0db5f73..c375a1fa27 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.44", - "@budibase/string-templates": "2.5.6-alpha.44", + "@budibase/shared-core": "2.5.6-alpha.45", + "@budibase/string-templates": "2.5.6-alpha.45", "@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 e5434c14a2..ad0856a418 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.44", - "@budibase/frontend-core": "2.5.6-alpha.44", - "@budibase/shared-core": "2.5.6-alpha.44", - "@budibase/string-templates": "2.5.6-alpha.44", + "@budibase/bbui": "2.5.6-alpha.45", + "@budibase/frontend-core": "2.5.6-alpha.45", + "@budibase/shared-core": "2.5.6-alpha.45", + "@budibase/string-templates": "2.5.6-alpha.45", "@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 1424fd7021..e21f09f233 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.44", - "@budibase/string-templates": "2.5.6-alpha.44", - "@budibase/types": "2.5.6-alpha.44", + "@budibase/backend-core": "2.5.6-alpha.45", + "@budibase/string-templates": "2.5.6-alpha.45", + "@budibase/types": "2.5.6-alpha.45", "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 19ba08c169..00c9268d74 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.44", - "@budibase/frontend-core": "2.5.6-alpha.44", - "@budibase/shared-core": "2.5.6-alpha.44", - "@budibase/string-templates": "2.5.6-alpha.44", - "@budibase/types": "2.5.6-alpha.44", + "@budibase/bbui": "2.5.6-alpha.45", + "@budibase/frontend-core": "2.5.6-alpha.45", + "@budibase/shared-core": "2.5.6-alpha.45", + "@budibase/string-templates": "2.5.6-alpha.45", + "@budibase/types": "2.5.6-alpha.45", "@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 414aac562e..878528f75e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.44", - "@budibase/shared-core": "2.5.6-alpha.44", + "@budibase/bbui": "2.5.6-alpha.45", + "@budibase/shared-core": "2.5.6-alpha.45", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 618469354a..d253b9d491 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 34569a9727..48e2ea5933 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.44", + "version": "2.5.6-alpha.45", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.44", - "@budibase/client": "2.5.6-alpha.44", + "@budibase/backend-core": "2.5.6-alpha.45", + "@budibase/client": "2.5.6-alpha.45", "@budibase/pro": "2.5.6-alpha.44", - "@budibase/shared-core": "2.5.6-alpha.44", - "@budibase/string-templates": "2.5.6-alpha.44", - "@budibase/types": "2.5.6-alpha.44", + "@budibase/shared-core": "2.5.6-alpha.45", + "@budibase/string-templates": "2.5.6-alpha.45", + "@budibase/types": "2.5.6-alpha.45", "@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 b4fa8ac9e5..f78dd95c19 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.44" + "@budibase/types": "2.5.6-alpha.45" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 4db78ef952..0226884986 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "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 79a9b5d05c..099237d2da 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.44", + "version": "2.5.6-alpha.45", "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 7e6a9c5495..0d9f642701 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.44", + "version": "2.5.6-alpha.45", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.44", + "@budibase/backend-core": "2.5.6-alpha.45", "@budibase/pro": "2.5.6-alpha.44", - "@budibase/string-templates": "2.5.6-alpha.44", - "@budibase/types": "2.5.6-alpha.44", + "@budibase/string-templates": "2.5.6-alpha.45", + "@budibase/types": "2.5.6-alpha.45", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From eb973386d8a8aa1f4f59d199121d46ff75ccc3fd Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 3 May 2023 13:16:23 +0000 Subject: [PATCH 186/521] Update pro version to 2.5.6-alpha.45 --- 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 48e2ea5933..b41116b86c 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.45", "@budibase/client": "2.5.6-alpha.45", - "@budibase/pro": "2.5.6-alpha.44", + "@budibase/pro": "2.5.6-alpha.45", "@budibase/shared-core": "2.5.6-alpha.45", "@budibase/string-templates": "2.5.6-alpha.45", "@budibase/types": "2.5.6-alpha.45", diff --git a/packages/worker/package.json b/packages/worker/package.json index 0d9f642701..9a1f38214f 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.45", - "@budibase/pro": "2.5.6-alpha.44", + "@budibase/pro": "2.5.6-alpha.45", "@budibase/string-templates": "2.5.6-alpha.45", "@budibase/types": "2.5.6-alpha.45", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 815b155ff9..3da316081c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.43": - version "2.5.6-alpha.43" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.43.tgz#3273219bcb51c0dde75753d59b22698722aad673" - integrity sha512-xUU7wFLsRczmPoystg5PN4GPtks0leMrdQJpCA3hxGM09szSHEheGKRCH3fpXhwbYe8GRsJx+27xrVxkW4+9yQ== +"@budibase/pro@2.5.6-alpha.44": + version "2.5.6-alpha.44" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.44.tgz#f849e7bceb06144083cc4b1d406ffa195348c4f1" + integrity sha512-duU1w9OhnycNvdfJx941OwrI3siTL3bOF793/yp8GisqSH/76vEwpu1VsAV/pqRywkwpr1LkilPkPPufiNURLg== dependencies: - "@budibase/backend-core" "2.5.6-alpha.43" + "@budibase/backend-core" "2.5.6-alpha.44" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.43" + "@budibase/types" "2.5.6-alpha.44" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 47a37edad7f9a56086a6097305b1aa2f3eab3349 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 3 May 2023 16:10:22 +0100 Subject: [PATCH 187/521] Update lockfiles --- yarn.lock | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/yarn.lock b/yarn.lock index 90f1a20d88..ca3f44d9a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.45": - version "2.5.6-alpha.45" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.45.tgz#99b536f01a7f2bc291f305263fca0d42d0cf2c12" - integrity sha512-R11iRHzEwseVIH10mf7knzML2SVxnLCyyNSoTJu/xLisgn4cBUs9S+swAx6mtZ1sx6bNd7ULYzOHHAw9ATy6dg== +"@budibase/pro@2.5.9": + version "2.5.9" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.9.tgz#0c27da00c1c71260cf10295177fd8904277c9edc" + integrity sha512-EKYW+ud0SPwWjCtW9cDrRkBrxf7j/266btWuaqMLYHpR/s15vtN6h/jPvNt0RSpDbTAEgwt3A7QNQ1GjEI6YjQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.45" - "@budibase/shared-core" "2.4.44-alpha.1" - "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.45" + "@budibase/backend-core" "2.5.9" + "@budibase/string-templates" "2.3.20" + "@budibase/types" "2.5.9" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1502,15 +1501,6 @@ lru-cache "^7.14.1" memorystream "^0.3.1" node-fetch "^2.6.1" - scim-patch "^0.7.0" - scim2-parse-filter "^0.2.8" - -"@budibase/shared-core@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.4.44-alpha.1.tgz#3d499e40e7e6c646e13a87cd08e01ba116c2ff1d" - integrity sha512-cN8LaDczijtsfWUYiXC4sg9Z+US4020i3Mb8TwCbf8TQyA1b06U5PwPCp+GHVA/wDFqfwcpcE1GXf8GwVuYs7A== - dependencies: - "@budibase/types" "2.4.44-alpha.1" "@budibase/standard-components@^0.9.139": version "0.9.139" @@ -1530,10 +1520,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.4.44-alpha.1.tgz#6c2aee594d16eac1f173c509e087a817dd3172f0" - integrity sha512-4gC2+0kccK0ilLnd0i/dmJzC0Ur7UgSAmV6zbzDDYNL4spU0qSy5VhBh7E3qKieg5RKMMzbpXLMWERpoPLlnqA== +"@budibase/string-templates@2.3.20": + version "2.3.20" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588" + integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg== dependencies: "@budibase/handlebars-helpers" "^0.11.8" dayjs "^1.10.4" @@ -1542,11 +1532,6 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" - integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -21642,7 +21627,7 @@ scim-patch@^0.7.0: fast-deep-equal "3.1.3" scim2-parse-filter "0.2.8" -scim2-parse-filter@0.2.8, scim2-parse-filter@^0.2.8: +scim2-parse-filter@0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/scim2-parse-filter/-/scim2-parse-filter-0.2.8.tgz#12e836514b9a55ae51218dd6e7fbea91daccfa4d" integrity sha512-1V+6FIMIiP+gDiFkC3dIw86KfoXhnQRXhfPaiQImeeFukpLtEkTtYq/Vmy1yDgHQcIHQxQQqOWyGLKX0FTvvaA== From 9e986ac69d0fb10deeca5460722a06e42f708df3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 3 May 2023 15:23:47 +0000 Subject: [PATCH 188/521] v2.5.10-alpha.0 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index a6fe00fe5d..d9c7eca7ef 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.9", + "version": "2.5.10-alpha.0", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 633677f617..f151e75623 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.5.9", + "@budibase/types": "2.5.10-alpha.0", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4d50d0cdcc..6f50176780 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.9", + "version": "2.5.10-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.5.9", - "@budibase/string-templates": "^2.5.9", + "@budibase/shared-core": "2.5.10-alpha.0", + "@budibase/string-templates": "2.5.10-alpha.0", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index a773b4a160..25adb35aaf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.9", - "@budibase/frontend-core": "^2.5.9", - "@budibase/shared-core": "^2.5.9", - "@budibase/string-templates": "^2.5.9", + "@budibase/bbui": "2.5.10-alpha.0", + "@budibase/frontend-core": "2.5.10-alpha.0", + "@budibase/shared-core": "2.5.10-alpha.0", + "@budibase/string-templates": "2.5.10-alpha.0", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 1b264de603..6037da7e4d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.5.9", - "@budibase/string-templates": "^2.5.9", - "@budibase/types": "^2.5.9", + "@budibase/backend-core": "2.5.10-alpha.0", + "@budibase/string-templates": "2.5.10-alpha.0", + "@budibase/types": "2.5.10-alpha.0", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index faaf16138a..e8770c5cb1 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.5.9", - "@budibase/frontend-core": "^2.5.9", - "@budibase/shared-core": "^2.5.9", - "@budibase/string-templates": "^2.5.9", - "@budibase/types": "^2.5.9", + "@budibase/bbui": "2.5.10-alpha.0", + "@budibase/frontend-core": "2.5.10-alpha.0", + "@budibase/shared-core": "2.5.10-alpha.0", + "@budibase/string-templates": "2.5.10-alpha.0", + "@budibase/types": "2.5.10-alpha.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 2d34142771..680756aa38 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.5.9", - "@budibase/shared-core": "^2.5.9", + "@budibase/bbui": "2.5.10-alpha.0", + "@budibase/shared-core": "2.5.10-alpha.0", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 75a6bc5235..6730ad8e76 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 1929d64826..ed45bd5812 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.9", + "version": "2.5.10-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.9", - "@budibase/client": "^2.5.9", + "@budibase/backend-core": "2.5.10-alpha.0", + "@budibase/client": "2.5.10-alpha.0", "@budibase/pro": "2.5.9", - "@budibase/shared-core": "^2.5.9", - "@budibase/string-templates": "^2.5.9", - "@budibase/types": "^2.5.9", + "@budibase/shared-core": "2.5.10-alpha.0", + "@budibase/string-templates": "2.5.10-alpha.0", + "@budibase/types": "2.5.10-alpha.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 332d8b6f60..e29fea93af 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.5.9" + "@budibase/types": "2.5.10-alpha.0" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 624ee36f03..14af9c2afb 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index aed792b67c..0c84a25627 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.9", + "version": "2.5.10-alpha.0", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 31a0ea1d4c..9cdd689453 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.9", + "version": "2.5.10-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.9", + "@budibase/backend-core": "2.5.10-alpha.0", "@budibase/pro": "2.5.9", - "@budibase/string-templates": "^2.5.9", - "@budibase/types": "^2.5.9", + "@budibase/string-templates": "2.5.10-alpha.0", + "@budibase/types": "2.5.10-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7facf0c9ea8325ba2c0b4f29aef15a6a728ec4e5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 3 May 2023 15:25:16 +0000 Subject: [PATCH 189/521] Update pro version to 2.5.10-alpha.0 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index ed45bd5812..5003e6bdc5 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.10-alpha.0", "@budibase/client": "2.5.10-alpha.0", - "@budibase/pro": "2.5.9", + "@budibase/pro": "2.5.10-alpha.0", "@budibase/shared-core": "2.5.10-alpha.0", "@budibase/string-templates": "2.5.10-alpha.0", "@budibase/types": "2.5.10-alpha.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 9cdd689453..104ca9db31 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.10-alpha.0", - "@budibase/pro": "2.5.9", + "@budibase/pro": "2.5.10-alpha.0", "@budibase/string-templates": "2.5.10-alpha.0", "@budibase/types": "2.5.10-alpha.0", "@koa/router": "8.0.8", From 6df5e6f6d8c21702b6c8f7e17e2fe987c57dcfd6 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 3 May 2023 16:40:58 +0100 Subject: [PATCH 190/521] Update Dockerfile --- hosting/couchdb/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/couchdb/Dockerfile b/hosting/couchdb/Dockerfile index 11fab7129f..f3673fbd44 100644 --- a/hosting/couchdb/Dockerfile +++ b/hosting/couchdb/Dockerfile @@ -5,7 +5,7 @@ ENV COUCHDB_PASSWORD admin EXPOSE 5984 RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common wget unzip curl && \ - apt-add-repository 'deb http://security.debian.org/debian-security stretch/updates main' && \ + apt-add-repository 'deb http://security.debian.org/debian-security bullseye-security/updates main' && \ apt-get update && apt-get install -y --no-install-recommends openjdk-8-jre && \ rm -rf /var/lib/apt/lists/ From b570efc2c6fbd1d2ac88d79649683e9e17203b3a Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 3 May 2023 16:42:26 +0100 Subject: [PATCH 191/521] Update Dockerfile --- hosting/single/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index 2c6c06aa6e..410782c500 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -32,7 +32,7 @@ COPY --from=build /worker /worker # install base dependencies RUN apt-get update && \ apt-get install -y --no-install-recommends software-properties-common nginx uuid-runtime redis-server && \ - apt-add-repository 'deb http://security.debian.org/debian-security stretch/updates main' && \ + apt-add-repository 'deb http://security.debian.org/debian-security bullseye-security/updates main' && \ apt-get update # install other dependencies, nodejs, oracle requirements, jdk8, redis, nginx From 46acac0e5fa32c8d79f0be262c94cc343e56c09b Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 3 May 2023 16:48:53 +0100 Subject: [PATCH 192/521] Update Dockerfile --- hosting/couchdb/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosting/couchdb/Dockerfile b/hosting/couchdb/Dockerfile index f3673fbd44..0de5288f6d 100644 --- a/hosting/couchdb/Dockerfile +++ b/hosting/couchdb/Dockerfile @@ -5,7 +5,8 @@ ENV COUCHDB_PASSWORD admin EXPOSE 5984 RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common wget unzip curl && \ - apt-add-repository 'deb http://security.debian.org/debian-security bullseye-security/updates main' && \ + apt-add-repository 'deb http://security.debian.org/debian-security stretch/updates main' && \ + apt-add-repository 'deb http://archive.debian.org/debian stretch-backports main' && \ apt-get update && apt-get install -y --no-install-recommends openjdk-8-jre && \ rm -rf /var/lib/apt/lists/ From a2737346f15a5b7d63c78a6d3e365416f50c0155 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 3 May 2023 16:49:12 +0100 Subject: [PATCH 193/521] Update Dockerfile --- hosting/single/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index 410782c500..80ea72dce0 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -32,7 +32,8 @@ COPY --from=build /worker /worker # install base dependencies RUN apt-get update && \ apt-get install -y --no-install-recommends software-properties-common nginx uuid-runtime redis-server && \ - apt-add-repository 'deb http://security.debian.org/debian-security bullseye-security/updates main' && \ + apt-add-repository 'deb http://security.debian.org/debian-security stretch/updates main' && \ + apt-add-repository 'deb http://archive.debian.org/debian stretch-backports main' && \ apt-get update # install other dependencies, nodejs, oracle requirements, jdk8, redis, nginx From 392ae49240cdbae1a713f363065e5b8825c335fb Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 3 May 2023 18:04:06 +0100 Subject: [PATCH 194/521] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 26d3a26c1e..89b236619d 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 26d3a26c1e5b0fbfd6fc5614b30934352b8cf5ae +Subproject commit 89b236619d6f3b76dc3e733f9cad215db2d8994f From b2973a51b1309cd804e6cb3916003fa9ff24ef04 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 3 May 2023 18:22:19 +0100 Subject: [PATCH 195/521] Updating Dockerfiles as per #10472 for master. --- hosting/couchdb/Dockerfile | 6 ++++-- hosting/single/Dockerfile | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hosting/couchdb/Dockerfile b/hosting/couchdb/Dockerfile index 0de5288f6d..70b4413859 100644 --- a/hosting/couchdb/Dockerfile +++ b/hosting/couchdb/Dockerfile @@ -5,9 +5,11 @@ ENV COUCHDB_PASSWORD admin EXPOSE 5984 RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common wget unzip curl && \ - apt-add-repository 'deb http://security.debian.org/debian-security stretch/updates main' && \ + wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \ + apt-add-repository 'deb http://security.debian.org/debian-security bullseye-security/updates main' && \ apt-add-repository 'deb http://archive.debian.org/debian stretch-backports main' && \ - apt-get update && apt-get install -y --no-install-recommends openjdk-8-jre && \ + apt-add-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ && \ + apt-get update && apt-get install -y --no-install-recommends adoptopenjdk-8-hotspot && \ rm -rf /var/lib/apt/lists/ # setup clouseau diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index 80ea72dce0..fadcf235e9 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -22,7 +22,7 @@ FROM budibase/couchdb ARG TARGETARCH ENV TARGETARCH $TARGETARCH #TARGETBUILD can be set to single (for single docker image) or aas (for azure app service) -# e.g. docker build --build-arg TARGETBUILD=aas .... +# e.g. docker build --build-arg TARGETBUILD=aas .... ARG TARGETBUILD=single ENV TARGETBUILD $TARGETBUILD @@ -32,8 +32,7 @@ COPY --from=build /worker /worker # install base dependencies RUN apt-get update && \ apt-get install -y --no-install-recommends software-properties-common nginx uuid-runtime redis-server && \ - apt-add-repository 'deb http://security.debian.org/debian-security stretch/updates main' && \ - apt-add-repository 'deb http://archive.debian.org/debian stretch-backports main' && \ + apt-add-repository 'deb http://security.debian.org/debian-security bullseye-security/updates main' && \ apt-get update # install other dependencies, nodejs, oracle requirements, jdk8, redis, nginx From 991e91e2045a0d6cab5ae62e674af67e73147de1 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 3 May 2023 17:28:55 +0000 Subject: [PATCH 196/521] v2.5.10-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index d9c7eca7ef..c226dea49e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.10-alpha.0", + "version": "2.5.10-alpha.1", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f151e75623..b66112e8de 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.10-alpha.0", + "version": "2.5.10-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.10-alpha.0", + "@budibase/types": "2.5.10-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 6f50176780..0e99b34384 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.10-alpha.0", + "version": "2.5.10-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.10-alpha.0", - "@budibase/string-templates": "2.5.10-alpha.0", + "@budibase/shared-core": "2.5.10-alpha.1", + "@budibase/string-templates": "2.5.10-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 25adb35aaf..9607e51344 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.10-alpha.0", + "version": "2.5.10-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.10-alpha.0", - "@budibase/frontend-core": "2.5.10-alpha.0", - "@budibase/shared-core": "2.5.10-alpha.0", - "@budibase/string-templates": "2.5.10-alpha.0", + "@budibase/bbui": "2.5.10-alpha.1", + "@budibase/frontend-core": "2.5.10-alpha.1", + "@budibase/shared-core": "2.5.10-alpha.1", + "@budibase/string-templates": "2.5.10-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 6037da7e4d..3d663babd5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.10-alpha.0", + "version": "2.5.10-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.10-alpha.0", - "@budibase/string-templates": "2.5.10-alpha.0", - "@budibase/types": "2.5.10-alpha.0", + "@budibase/backend-core": "2.5.10-alpha.1", + "@budibase/string-templates": "2.5.10-alpha.1", + "@budibase/types": "2.5.10-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 e8770c5cb1..4016899f8c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.10-alpha.0", + "version": "2.5.10-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.10-alpha.0", - "@budibase/frontend-core": "2.5.10-alpha.0", - "@budibase/shared-core": "2.5.10-alpha.0", - "@budibase/string-templates": "2.5.10-alpha.0", - "@budibase/types": "2.5.10-alpha.0", + "@budibase/bbui": "2.5.10-alpha.1", + "@budibase/frontend-core": "2.5.10-alpha.1", + "@budibase/shared-core": "2.5.10-alpha.1", + "@budibase/string-templates": "2.5.10-alpha.1", + "@budibase/types": "2.5.10-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 680756aa38..937574814e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.10-alpha.0", + "version": "2.5.10-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.10-alpha.0", - "@budibase/shared-core": "2.5.10-alpha.0", + "@budibase/bbui": "2.5.10-alpha.1", + "@budibase/shared-core": "2.5.10-alpha.1", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 6730ad8e76..0843bd509f 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.10-alpha.0", + "version": "2.5.10-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 5003e6bdc5..1a8b18c6da 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.10-alpha.0", + "version": "2.5.10-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.10-alpha.0", - "@budibase/client": "2.5.10-alpha.0", + "@budibase/backend-core": "2.5.10-alpha.1", + "@budibase/client": "2.5.10-alpha.1", "@budibase/pro": "2.5.10-alpha.0", - "@budibase/shared-core": "2.5.10-alpha.0", - "@budibase/string-templates": "2.5.10-alpha.0", - "@budibase/types": "2.5.10-alpha.0", + "@budibase/shared-core": "2.5.10-alpha.1", + "@budibase/string-templates": "2.5.10-alpha.1", + "@budibase/types": "2.5.10-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 e29fea93af..2b8f75f738 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.10-alpha.0", + "version": "2.5.10-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.10-alpha.0" + "@budibase/types": "2.5.10-alpha.1" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 14af9c2afb..3349aad7ba 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.10-alpha.0", + "version": "2.5.10-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 0c84a25627..4367270c85 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.10-alpha.0", + "version": "2.5.10-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 104ca9db31..2894ce0e13 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.10-alpha.0", + "version": "2.5.10-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.10-alpha.0", + "@budibase/backend-core": "2.5.10-alpha.1", "@budibase/pro": "2.5.10-alpha.0", - "@budibase/string-templates": "2.5.10-alpha.0", - "@budibase/types": "2.5.10-alpha.0", + "@budibase/string-templates": "2.5.10-alpha.1", + "@budibase/types": "2.5.10-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 77116bf4c2ca93ec9ef008e5070d4c2f3bf56643 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 3 May 2023 17:30:27 +0000 Subject: [PATCH 197/521] Update pro version to 2.5.10-alpha.1 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 43 ++++++++++++++++++++++++------------ 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 1a8b18c6da..d0ff56531b 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.10-alpha.1", "@budibase/client": "2.5.10-alpha.1", - "@budibase/pro": "2.5.10-alpha.0", + "@budibase/pro": "2.5.10-alpha.1", "@budibase/shared-core": "2.5.10-alpha.1", "@budibase/string-templates": "2.5.10-alpha.1", "@budibase/types": "2.5.10-alpha.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index 2894ce0e13..165689cf7c 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.10-alpha.1", - "@budibase/pro": "2.5.10-alpha.0", + "@budibase/pro": "2.5.10-alpha.1", "@budibase/string-templates": "2.5.10-alpha.1", "@budibase/types": "2.5.10-alpha.1", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index ca3f44d9a8..5f17870a6f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,14 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.9": - version "2.5.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.9.tgz#0c27da00c1c71260cf10295177fd8904277c9edc" - integrity sha512-EKYW+ud0SPwWjCtW9cDrRkBrxf7j/266btWuaqMLYHpR/s15vtN6h/jPvNt0RSpDbTAEgwt3A7QNQ1GjEI6YjQ== +"@budibase/pro@2.5.10-alpha.0": + version "2.5.10-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.0.tgz#f3688cc61d2130fbf8b191e515b8ac9789f2a9df" + integrity sha512-vYa1F4NhMh7veSZyhgrE54iziwZLHiuRwXbU+unEo3xqyFZIvERAAQZ88nrnwssubWBWnPhpN/8JMHrsyM8mXg== dependencies: - "@budibase/backend-core" "2.5.9" - "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.9" + "@budibase/backend-core" "2.5.10-alpha.0" + "@budibase/shared-core" "2.5.9" + "@budibase/string-templates" "2.5.9" + "@budibase/types" "2.5.10-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.5.9": + version "2.5.9" + resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.9.tgz#f22f22637fb7618ded1c7292b10793d7969827ce" + integrity sha512-l417Rb2+1tuXbjNL42wJHmqIQQyla2pPglOnapxfOdRuvzng+5GqlrTV1caLNf/53TS9U6ueGJdPOtxZTTFGUA== + dependencies: + "@budibase/types" "^2.5.9" "@budibase/standard-components@^0.9.139": version "0.9.139" @@ -1520,17 +1530,22 @@ 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.5.9": + version "2.5.9" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.9.tgz#64582730421801e1e829b430136b449b1adc0314" + integrity sha512-Szu06M0JFHuUVIil2aHZWU8hvsROYpDx9raX9uIv4DcwBOAtyvVzD16wOCHzlmj8wWeV8fbKe4JF4q4GXnilJg== dependencies: "@budibase/handlebars-helpers" "^0.11.8" dayjs "^1.10.4" handlebars "^4.7.6" handlebars-utils "^1.0.6" lodash "^4.17.20" - vm2 "^3.9.4" + vm2 "^3.9.15" + +"@budibase/types@^2.5.9": + version "2.5.9" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.9.tgz#4b1253e76b95cd8d6a42e86ebc3363a305c62653" + integrity sha512-7NELdWB3iV5y+pmXhm9g/v1AlN+wqHtoy67DZxKY5dlcK4DCcTdlqkToGiiw9d3sDPgDAVznjdZYnB5pGzd3TQ== "@bull-board/api@3.7.0": version "3.7.0" @@ -21627,7 +21642,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== @@ -24487,7 +24502,7 @@ vm2@3.9.17: acorn "^8.7.0" acorn-walk "^8.2.0" -vm2@^3.9.11, vm2@^3.9.15, vm2@^3.9.4: +vm2@^3.9.11, vm2@^3.9.15: version "3.9.16" resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.16.tgz#0fbc2a265f7bf8b837cea6f4a908f88a3f93b8e6" integrity sha512-3T9LscojNTxdOyG+e8gFeyBXkMlOBYDoF6dqZbj+MPVHi9x10UfiTAJIobuchRCp3QvC+inybTbMJIUrLsig0w== From dbd101733f0bae8628caff09bebe9a832a9d078f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 01:53:57 +0000 Subject: [PATCH 198/521] Bump engine.io from 6.4.1 to 6.4.2 Bumps [engine.io](https://github.com/socketio/engine.io) from 6.4.1 to 6.4.2. - [Release notes](https://github.com/socketio/engine.io/releases) - [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/engine.io/compare/6.4.1...6.4.2) --- updated-dependencies: - dependency-name: engine.io dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5f17870a6f..0e5c80f96a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.10-alpha.0": - version "2.5.10-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.0.tgz#f3688cc61d2130fbf8b191e515b8ac9789f2a9df" - integrity sha512-vYa1F4NhMh7veSZyhgrE54iziwZLHiuRwXbU+unEo3xqyFZIvERAAQZ88nrnwssubWBWnPhpN/8JMHrsyM8mXg== +"@budibase/pro@2.5.10-alpha.1": + version "2.5.10-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.1.tgz#9b3241809330860a0c38bcd08a31c8ddfe4f7fe8" + integrity sha512-Bhy9fb0HmfLpmaknfE+qxxRB4X4CWKHho2WMVugqLqzpLIyYJIksNucJgIu4EHPP6By24R0PtcCoJNZNgn6xNw== dependencies: - "@budibase/backend-core" "2.5.10-alpha.0" + "@budibase/backend-core" "2.5.10-alpha.1" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.5.10-alpha.0" + "@budibase/types" "2.5.10-alpha.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -9977,9 +9977,9 @@ engine.io-parser@~5.0.3: integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw== engine.io@~6.4.1: - version "6.4.1" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.1.tgz#8056b4526a88e779f9c280d820422d4e3eeaaae5" - integrity sha512-JFYQurD/nbsA5BSPmbaOSLa3tSVj8L6o4srSwXXY3NqE+gGUNmmPTbhn8tjzcCtSqhFgIeqef81ngny8JM25hw== + version "6.4.2" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.2.tgz#ffeaf68f69b1364b0286badddf15ff633476473f" + integrity sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg== dependencies: "@types/cookie" "^0.4.1" "@types/cors" "^2.8.12" From 2506f6181290c7dc71a0c00ced2b6067b4af1d49 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 4 May 2023 07:54:29 +0000 Subject: [PATCH 199/521] v2.5.10 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index c226dea49e..36b1d641f4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.10-alpha.1", + "version": "2.5.10", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b66112e8de..eae67a52ff 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.10-alpha.1", + "version": "2.5.10", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.10-alpha.1", + "@budibase/types": "^2.5.10", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 0e99b34384..2ded999c6f 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.10-alpha.1", + "version": "2.5.10", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.10-alpha.1", - "@budibase/string-templates": "2.5.10-alpha.1", + "@budibase/shared-core": "^2.5.10", + "@budibase/string-templates": "^2.5.10", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 9607e51344..e3fe02d621 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.10-alpha.1", + "version": "2.5.10", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.10-alpha.1", - "@budibase/frontend-core": "2.5.10-alpha.1", - "@budibase/shared-core": "2.5.10-alpha.1", - "@budibase/string-templates": "2.5.10-alpha.1", + "@budibase/bbui": "^2.5.10", + "@budibase/frontend-core": "^2.5.10", + "@budibase/shared-core": "^2.5.10", + "@budibase/string-templates": "^2.5.10", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 3d663babd5..917685da1d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.10-alpha.1", + "version": "2.5.10", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.10-alpha.1", - "@budibase/string-templates": "2.5.10-alpha.1", - "@budibase/types": "2.5.10-alpha.1", + "@budibase/backend-core": "^2.5.10", + "@budibase/string-templates": "^2.5.10", + "@budibase/types": "^2.5.10", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 4016899f8c..046544be3b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.10-alpha.1", + "version": "2.5.10", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.10-alpha.1", - "@budibase/frontend-core": "2.5.10-alpha.1", - "@budibase/shared-core": "2.5.10-alpha.1", - "@budibase/string-templates": "2.5.10-alpha.1", - "@budibase/types": "2.5.10-alpha.1", + "@budibase/bbui": "^2.5.10", + "@budibase/frontend-core": "^2.5.10", + "@budibase/shared-core": "^2.5.10", + "@budibase/string-templates": "^2.5.10", + "@budibase/types": "^2.5.10", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 937574814e..282f01535a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.10-alpha.1", + "version": "2.5.10", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.10-alpha.1", - "@budibase/shared-core": "2.5.10-alpha.1", + "@budibase/bbui": "^2.5.10", + "@budibase/shared-core": "^2.5.10", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0843bd509f..18fce67313 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.10-alpha.1", + "version": "2.5.10", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index d0ff56531b..042ba95c6f 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.10-alpha.1", + "version": "2.5.10", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.10-alpha.1", - "@budibase/client": "2.5.10-alpha.1", + "@budibase/backend-core": "^2.5.10", + "@budibase/client": "^2.5.10", "@budibase/pro": "2.5.10-alpha.1", - "@budibase/shared-core": "2.5.10-alpha.1", - "@budibase/string-templates": "2.5.10-alpha.1", - "@budibase/types": "2.5.10-alpha.1", + "@budibase/shared-core": "^2.5.10", + "@budibase/string-templates": "^2.5.10", + "@budibase/types": "^2.5.10", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 2b8f75f738..fd2b653a9b 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.10-alpha.1", + "version": "2.5.10", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.10-alpha.1" + "@budibase/types": "^2.5.10" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 3349aad7ba..08eaf6abc8 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.10-alpha.1", + "version": "2.5.10", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 4367270c85..07f3b4585b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.10-alpha.1", + "version": "2.5.10", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 165689cf7c..30131b4e23 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.10-alpha.1", + "version": "2.5.10", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.10-alpha.1", + "@budibase/backend-core": "^2.5.10", "@budibase/pro": "2.5.10-alpha.1", - "@budibase/string-templates": "2.5.10-alpha.1", - "@budibase/types": "2.5.10-alpha.1", + "@budibase/string-templates": "^2.5.10", + "@budibase/types": "^2.5.10", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From dd07f979f92cbe5cf3effb670787720d0731b5f3 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 4 May 2023 07:55:58 +0000 Subject: [PATCH 200/521] Update pro version to 2.5.10 --- 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 042ba95c6f..31beefd981 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.10", "@budibase/client": "^2.5.10", - "@budibase/pro": "2.5.10-alpha.1", + "@budibase/pro": "2.5.10", "@budibase/shared-core": "^2.5.10", "@budibase/string-templates": "^2.5.10", "@budibase/types": "^2.5.10", diff --git a/packages/worker/package.json b/packages/worker/package.json index 30131b4e23..c88b746c97 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.10", - "@budibase/pro": "2.5.10-alpha.1", + "@budibase/pro": "2.5.10", "@budibase/string-templates": "^2.5.10", "@budibase/types": "^2.5.10", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 5f17870a6f..30a65b871a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.10-alpha.0": - version "2.5.10-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.0.tgz#f3688cc61d2130fbf8b191e515b8ac9789f2a9df" - integrity sha512-vYa1F4NhMh7veSZyhgrE54iziwZLHiuRwXbU+unEo3xqyFZIvERAAQZ88nrnwssubWBWnPhpN/8JMHrsyM8mXg== +"@budibase/pro@2.5.10-alpha.1": + version "2.5.10-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.1.tgz#9b3241809330860a0c38bcd08a31c8ddfe4f7fe8" + integrity sha512-Bhy9fb0HmfLpmaknfE+qxxRB4X4CWKHho2WMVugqLqzpLIyYJIksNucJgIu4EHPP6By24R0PtcCoJNZNgn6xNw== dependencies: - "@budibase/backend-core" "2.5.10-alpha.0" + "@budibase/backend-core" "2.5.10-alpha.1" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.5.10-alpha.0" + "@budibase/types" "2.5.10-alpha.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From cd59df8fa95b4cfd3b6047626101c798961366a6 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 4 May 2023 10:27:21 +0100 Subject: [PATCH 201/521] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 1877e22c97..616aa3ae4b 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 1877e22c9723c3b4e497a345445e2b8ee52a7fc0 +Subproject commit 616aa3ae4b13c65a4630be2126f86cda0fcec071 From 75d8dd907fe77284526e6babc20903bb5a2ddf66 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 4 May 2023 11:00:04 +0100 Subject: [PATCH 202/521] fix for limit banner re-appearing --- .../src/components/portal/licensing/licensingBanners.js | 3 +++ .../builder/src/pages/builder/portal/users/users/index.svelte | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/portal/licensing/licensingBanners.js b/packages/builder/src/components/portal/licensing/licensingBanners.js index 41c6585b02..dafa8cfaed 100644 --- a/packages/builder/src/components/portal/licensing/licensingBanners.js +++ b/packages/builder/src/components/portal/licensing/licensingBanners.js @@ -147,6 +147,9 @@ const buildUsersAboveLimitBanner = EXPIRY_KEY => { return { key: EXPIRY_KEY, type: BANNER_TYPES.WARNING, + onChange: () => { + defaultCacheFn(EXPIRY_KEY) + }, criteria: () => { return userLicensing.warnUserLimit }, diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte index 984ecd46ff..1b68d5884d 100644 --- a/packages/builder/src/pages/builder/portal/users/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte @@ -261,7 +261,7 @@ header={`Users will soon be limited to ${staticUserLimit}`} message={`Our free plan is going to be limited to ${staticUserLimit} users in ${$licensing.userLimitDays}. - This means any users exceeding the limit have been de-activated. + This means any users exceeding the limit will de-activated. De-activated users will not able to access the builder or any published apps until you upgrade to one of our paid plans. `} From 56eb0a318ce3b3a47db8e7c610c5499da8aadff5 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 4 May 2023 10:00:54 +0000 Subject: [PATCH 203/521] v2.6.0 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 36b1d641f4..c27dac0362 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.10", + "version": "2.6.0", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index eae67a52ff..a9811a66c5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.10", + "version": "2.6.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.5.10", + "@budibase/types": "^2.6.0", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 2ded999c6f..4cfad5cced 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.10", + "version": "2.6.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.5.10", - "@budibase/string-templates": "^2.5.10", + "@budibase/shared-core": "^2.6.0", + "@budibase/string-templates": "^2.6.0", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index e3fe02d621..4808196d7c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.10", + "version": "2.6.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.10", - "@budibase/frontend-core": "^2.5.10", - "@budibase/shared-core": "^2.5.10", - "@budibase/string-templates": "^2.5.10", + "@budibase/bbui": "^2.6.0", + "@budibase/frontend-core": "^2.6.0", + "@budibase/shared-core": "^2.6.0", + "@budibase/string-templates": "^2.6.0", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 917685da1d..cf40fff35c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.10", + "version": "2.6.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.5.10", - "@budibase/string-templates": "^2.5.10", - "@budibase/types": "^2.5.10", + "@budibase/backend-core": "^2.6.0", + "@budibase/string-templates": "^2.6.0", + "@budibase/types": "^2.6.0", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 046544be3b..f2ee5fe215 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.10", + "version": "2.6.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.5.10", - "@budibase/frontend-core": "^2.5.10", - "@budibase/shared-core": "^2.5.10", - "@budibase/string-templates": "^2.5.10", - "@budibase/types": "^2.5.10", + "@budibase/bbui": "^2.6.0", + "@budibase/frontend-core": "^2.6.0", + "@budibase/shared-core": "^2.6.0", + "@budibase/string-templates": "^2.6.0", + "@budibase/types": "^2.6.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 282f01535a..fad1de2c94 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.10", + "version": "2.6.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.5.10", - "@budibase/shared-core": "^2.5.10", + "@budibase/bbui": "^2.6.0", + "@budibase/shared-core": "^2.6.0", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 18fce67313..1a4297153e 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.10", + "version": "2.6.0", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 31beefd981..2594486c3e 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.10", + "version": "2.6.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.10", - "@budibase/client": "^2.5.10", + "@budibase/backend-core": "^2.6.0", + "@budibase/client": "^2.6.0", "@budibase/pro": "2.5.10", - "@budibase/shared-core": "^2.5.10", - "@budibase/string-templates": "^2.5.10", - "@budibase/types": "^2.5.10", + "@budibase/shared-core": "^2.6.0", + "@budibase/string-templates": "^2.6.0", + "@budibase/types": "^2.6.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index fd2b653a9b..ee57d001da 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.10", + "version": "2.6.0", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.5.10" + "@budibase/types": "^2.6.0" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 08eaf6abc8..096c7772cf 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.10", + "version": "2.6.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 07f3b4585b..ae46a0485d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.10", + "version": "2.6.0", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index c88b746c97..cc943ffe7c 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.10", + "version": "2.6.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.10", + "@budibase/backend-core": "^2.6.0", "@budibase/pro": "2.5.10", - "@budibase/string-templates": "^2.5.10", - "@budibase/types": "^2.5.10", + "@budibase/string-templates": "^2.6.0", + "@budibase/types": "^2.6.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 2cbae832c403f76ec743baeb6289c7c31471408a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 4 May 2023 10:02:34 +0000 Subject: [PATCH 204/521] Update pro version to 2.6.0 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 17 ++++++----------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 2594486c3e..8c27d3fd68 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.6.0", "@budibase/client": "^2.6.0", - "@budibase/pro": "2.5.10", + "@budibase/pro": "2.6.0", "@budibase/shared-core": "^2.6.0", "@budibase/string-templates": "^2.6.0", "@budibase/types": "^2.6.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index cc943ffe7c..09eff55365 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.0", - "@budibase/pro": "2.5.10", + "@budibase/pro": "2.6.0", "@budibase/string-templates": "^2.6.0", "@budibase/types": "^2.6.0", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 30a65b871a..918a974b7d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.10-alpha.1": - version "2.5.10-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.1.tgz#9b3241809330860a0c38bcd08a31c8ddfe4f7fe8" - integrity sha512-Bhy9fb0HmfLpmaknfE+qxxRB4X4CWKHho2WMVugqLqzpLIyYJIksNucJgIu4EHPP6By24R0PtcCoJNZNgn6xNw== +"@budibase/pro@2.5.10": + version "2.5.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10.tgz#b7d81c1615df7ba51a199c29d5c87dadad3f004e" + integrity sha512-c3uAYPyn3BXZyZc1940kIAbNoFOxWVJHQOCz+4AQLRUmMDznSNsOZGhzhdqlc2IL7xL51Oz3Ry5eAVhdPJWb7A== dependencies: - "@budibase/backend-core" "2.5.10-alpha.1" + "@budibase/backend-core" "2.5.10" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.5.10-alpha.1" + "@budibase/types" "2.5.10" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1542,11 +1542,6 @@ lodash "^4.17.20" vm2 "^3.9.15" -"@budibase/types@^2.5.9": - version "2.5.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.9.tgz#4b1253e76b95cd8d6a42e86ebc3363a305c62653" - integrity sha512-7NELdWB3iV5y+pmXhm9g/v1AlN+wqHtoy67DZxKY5dlcK4DCcTdlqkToGiiw9d3sDPgDAVznjdZYnB5pGzd3TQ== - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" From 1fe7f2fe1b43ba3b0eb88e80fbac89cb4afc032b Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 4 May 2023 11:09:21 +0100 Subject: [PATCH 205/521] fix copy --- .../builder/src/pages/builder/portal/users/users/index.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte index 1b68d5884d..8006ae0294 100644 --- a/packages/builder/src/pages/builder/portal/users/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte @@ -261,7 +261,7 @@ header={`Users will soon be limited to ${staticUserLimit}`} message={`Our free plan is going to be limited to ${staticUserLimit} users in ${$licensing.userLimitDays}. - This means any users exceeding the limit will de-activated. + This means any users exceeding the limit will be de-activated. De-activated users will not able to access the builder or any published apps until you upgrade to one of our paid plans. `} From 98963c1505105f2aaf122a25695fe46803de23c5 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 4 May 2023 11:21:24 +0100 Subject: [PATCH 206/521] Fix for inclusion parsing for arrays and options. View table fix to hide edit button --- .../components/backend/DataTable/Table.svelte | 2 ++ .../backend/DataTable/ViewDataTable.svelte | 1 + .../server/src/api/controllers/table/utils.ts | 16 ++++++++++------ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte index 4df6e9a306..bf14bdfc0c 100644 --- a/packages/builder/src/components/backend/DataTable/Table.svelte +++ b/packages/builder/src/components/backend/DataTable/Table.svelte @@ -22,6 +22,7 @@ export let rowCount export let disableSorting = false export let customPlaceholder = false + export let allowEditing = true const dispatch = createEventDispatcher() @@ -109,6 +110,7 @@ {rowCount} {disableSorting} {customPlaceholder} + allowEditRows={allowEditing} showAutoColumns={!hideAutocolumns} on:clickrelationship={e => selectRelationship(e.detail)} on:sort diff --git a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte index 056bc33994..d239cabd59 100644 --- a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte @@ -58,6 +58,7 @@ {loading} {type} rowCount={10} + allowEditing={false} bind:hideAutocolumns > diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts index 1a3eda683b..e57da7ae2d 100644 --- a/packages/server/src/api/controllers/table/utils.ts +++ b/packages/server/src/api/controllers/table/utils.ts @@ -129,17 +129,21 @@ export function importToRows( // the real schema of the table passed in, not the clone used for // incrementing auto IDs for (const [fieldName, schema] of Object.entries(originalTable.schema)) { + const rowVal = Array.isArray(row[fieldName]) ? row[fieldName] : [row[fieldName]] if ( (schema.type === FieldTypes.OPTIONS || - schema.type === FieldTypes.ARRAY) && - row[fieldName] && - (!schema.constraints!.inclusion || - schema.constraints!.inclusion.indexOf(row[fieldName]) === -1) + schema.type === FieldTypes.ARRAY) && + row[fieldName] ) { - schema.constraints!.inclusion = [ + + let merged = [ ...schema.constraints!.inclusion!, - row[fieldName], + ...rowVal ] + + let superSet = new Set(merged); + schema.constraints!.inclusion = Array.from(superSet); + schema.constraints!.inclusion.sort() } } From 2774e92d8359f093bcbdb236f6737fd8e56e149c Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 4 May 2023 10:39:20 +0000 Subject: [PATCH 207/521] v2.6.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index c27dac0362..4a716b4ca8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.0", + "version": "2.6.1", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a9811a66c5..ee5a62eb0c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.0", + "version": "2.6.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.6.0", + "@budibase/types": "^2.6.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 4cfad5cced..0964dffb3b 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.6.0", + "version": "2.6.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.6.0", - "@budibase/string-templates": "^2.6.0", + "@budibase/shared-core": "^2.6.1", + "@budibase/string-templates": "^2.6.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 4808196d7c..ce9d5bcfdf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.0", + "version": "2.6.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.0", - "@budibase/frontend-core": "^2.6.0", - "@budibase/shared-core": "^2.6.0", - "@budibase/string-templates": "^2.6.0", + "@budibase/bbui": "^2.6.1", + "@budibase/frontend-core": "^2.6.1", + "@budibase/shared-core": "^2.6.1", + "@budibase/string-templates": "^2.6.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 cf40fff35c..016d91c63f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.0", + "version": "2.6.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.6.0", - "@budibase/string-templates": "^2.6.0", - "@budibase/types": "^2.6.0", + "@budibase/backend-core": "^2.6.1", + "@budibase/string-templates": "^2.6.1", + "@budibase/types": "^2.6.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 f2ee5fe215..f7df964b19 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.0", + "version": "2.6.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.6.0", - "@budibase/frontend-core": "^2.6.0", - "@budibase/shared-core": "^2.6.0", - "@budibase/string-templates": "^2.6.0", - "@budibase/types": "^2.6.0", + "@budibase/bbui": "^2.6.1", + "@budibase/frontend-core": "^2.6.1", + "@budibase/shared-core": "^2.6.1", + "@budibase/string-templates": "^2.6.1", + "@budibase/types": "^2.6.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 fad1de2c94..9fe490f0d9 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.0", + "version": "2.6.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.6.0", - "@budibase/shared-core": "^2.6.0", + "@budibase/bbui": "^2.6.1", + "@budibase/shared-core": "^2.6.1", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1a4297153e..0562aef2f0 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.0", + "version": "2.6.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 8c27d3fd68..e0f1fb3199 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.0", + "version": "2.6.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.6.0", - "@budibase/client": "^2.6.0", + "@budibase/backend-core": "^2.6.1", + "@budibase/client": "^2.6.1", "@budibase/pro": "2.6.0", - "@budibase/shared-core": "^2.6.0", - "@budibase/string-templates": "^2.6.0", - "@budibase/types": "^2.6.0", + "@budibase/shared-core": "^2.6.1", + "@budibase/string-templates": "^2.6.1", + "@budibase/types": "^2.6.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 ee57d001da..e34cb2f79a 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.0", + "version": "2.6.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.6.0" + "@budibase/types": "^2.6.1" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 096c7772cf..d7bfd47c05 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.0", + "version": "2.6.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 ae46a0485d..0fb3ba19ec 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.0", + "version": "2.6.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 09eff55365..55649e7493 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.0", + "version": "2.6.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.6.0", + "@budibase/backend-core": "^2.6.1", "@budibase/pro": "2.6.0", - "@budibase/string-templates": "^2.6.0", - "@budibase/types": "^2.6.0", + "@budibase/string-templates": "^2.6.1", + "@budibase/types": "^2.6.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From eec66f6e5449f998bbe37abf2f5208324f79068c Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 4 May 2023 11:39:39 +0100 Subject: [PATCH 208/521] Update refs --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 616aa3ae4b..67838e687d 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 616aa3ae4b13c65a4630be2126f86cda0fcec071 +Subproject commit 67838e687df0a0cfa4c6d3d30cca11aa28689e7f From cde5259e4419696d0a594dfbcb6e5e8cc42689d4 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 4 May 2023 10:40:47 +0000 Subject: [PATCH 209/521] Update pro version to 2.6.1 --- 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 e0f1fb3199..3029ff9b63 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.6.1", "@budibase/client": "^2.6.1", - "@budibase/pro": "2.6.0", + "@budibase/pro": "2.6.1", "@budibase/shared-core": "^2.6.1", "@budibase/string-templates": "^2.6.1", "@budibase/types": "^2.6.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index 55649e7493..d794854093 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.1", - "@budibase/pro": "2.6.0", + "@budibase/pro": "2.6.1", "@budibase/string-templates": "^2.6.1", "@budibase/types": "^2.6.1", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 918a974b7d..c3e31e6ee6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.10": - version "2.5.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10.tgz#b7d81c1615df7ba51a199c29d5c87dadad3f004e" - integrity sha512-c3uAYPyn3BXZyZc1940kIAbNoFOxWVJHQOCz+4AQLRUmMDznSNsOZGhzhdqlc2IL7xL51Oz3Ry5eAVhdPJWb7A== +"@budibase/pro@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.0.tgz#ac93023ac4b3a5f8c7f39b2ed6240091b084c625" + integrity sha512-SBIh/TtT40XAUiF7b+9gEkShzbsWJWvCoti7w4YqrujsvVdbYsrwV8yY/FqaCAiHN4hlAXOEcYmF6lgK2g1Rjg== dependencies: - "@budibase/backend-core" "2.5.10" + "@budibase/backend-core" "2.6.0" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.5.10" + "@budibase/types" "2.6.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 56a1b068cc93d90445cbb8dc29a25d5250dd74cb Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 4 May 2023 11:52:20 +0100 Subject: [PATCH 210/521] Added json parse option for row import attachment values --- packages/server/src/utilities/rowProcessor/map.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts index 8911d62133..d3572094c6 100644 --- a/packages/server/src/utilities/rowProcessor/map.ts +++ b/packages/server/src/utilities/rowProcessor/map.ts @@ -70,6 +70,17 @@ export const TYPE_TRANSFORM_MAP: any = { "": [], [null]: [], [undefined]: undefined, + parse: (attachments) => { + if(typeof attachments === "string"){ + let result = attachments + try { + result = JSON.parse(attachments) + } catch (e) { + console.error("Could not parse attachments", e) + } + return result; + } + } }, [FieldTypes.BOOLEAN]: { "": null, From f8da7a9f2853c2b40cd95c1b59595ba82a8d5225 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 4 May 2023 12:12:47 +0100 Subject: [PATCH 211/521] Linting --- .../server/src/api/controllers/table/utils.ts | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts index e57da7ae2d..5681095df7 100644 --- a/packages/server/src/api/controllers/table/utils.ts +++ b/packages/server/src/api/controllers/table/utils.ts @@ -129,20 +129,18 @@ export function importToRows( // the real schema of the table passed in, not the clone used for // incrementing auto IDs for (const [fieldName, schema] of Object.entries(originalTable.schema)) { - const rowVal = Array.isArray(row[fieldName]) ? row[fieldName] : [row[fieldName]] + const rowVal = Array.isArray(row[fieldName]) + ? row[fieldName] + : [row[fieldName]] if ( (schema.type === FieldTypes.OPTIONS || - schema.type === FieldTypes.ARRAY) && + schema.type === FieldTypes.ARRAY) && row[fieldName] ) { - - let merged = [ - ...schema.constraints!.inclusion!, - ...rowVal - ] - - let superSet = new Set(merged); - schema.constraints!.inclusion = Array.from(superSet); + let merged = [...schema.constraints!.inclusion!, ...rowVal] + + let superSet = new Set(merged) + schema.constraints!.inclusion = Array.from(superSet) schema.constraints!.inclusion.sort() } From a1fdff8df8633e5a9f531be2c47b765118d72c17 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 4 May 2023 12:25:30 +0100 Subject: [PATCH 212/521] Linting --- packages/server/src/utilities/rowProcessor/map.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts index d3572094c6..cbf1c3ae36 100644 --- a/packages/server/src/utilities/rowProcessor/map.ts +++ b/packages/server/src/utilities/rowProcessor/map.ts @@ -70,17 +70,17 @@ export const TYPE_TRANSFORM_MAP: any = { "": [], [null]: [], [undefined]: undefined, - parse: (attachments) => { - if(typeof attachments === "string"){ + parse: attachments => { + if (typeof attachments === "string") { let result = attachments try { result = JSON.parse(attachments) } catch (e) { console.error("Could not parse attachments", e) } - return result; + return result } - } + }, }, [FieldTypes.BOOLEAN]: { "": null, From 5498cc86bdeec01457cb3eb2fba1a3631048b80b Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 4 May 2023 12:58:45 +0100 Subject: [PATCH 213/521] Refactor to fix tests and added an extra empty scenario --- packages/server/src/api/routes/tests/row.spec.js | 3 +++ packages/server/src/utilities/rowProcessor/map.ts | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/routes/tests/row.spec.js b/packages/server/src/api/routes/tests/row.spec.js index 5cbb3d04b4..4b835a1fb5 100644 --- a/packages/server/src/api/routes/tests/row.spec.js +++ b/packages/server/src/api/routes/tests/row.spec.js @@ -212,6 +212,7 @@ describe("/rows", () => { attachmentNull: attachment, attachmentUndefined: attachment, attachmentEmpty: attachment, + attachmentEmptyArrayStr: attachment }, }) @@ -239,6 +240,7 @@ describe("/rows", () => { attachmentNull: null, attachmentUndefined: undefined, attachmentEmpty: "", + attachmentEmptyArrayStr: "[]", } const id = (await config.createRow(row))._id @@ -268,6 +270,7 @@ describe("/rows", () => { expect(saved.attachmentNull).toEqual([]) expect(saved.attachmentUndefined).toBe(undefined) expect(saved.attachmentEmpty).toEqual([]) + expect(saved.attachmentEmptyArrayStr).toEqual([]) }) }) diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts index cbf1c3ae36..669223b302 100644 --- a/packages/server/src/utilities/rowProcessor/map.ts +++ b/packages/server/src/utilities/rowProcessor/map.ts @@ -67,12 +67,14 @@ export const TYPE_TRANSFORM_MAP: any = { }, }, [FieldTypes.ATTACHMENT]: { - "": [], [null]: [], [undefined]: undefined, parse: attachments => { if (typeof attachments === "string") { - let result = attachments + if (attachments === "") { + return [] + } + let result try { result = JSON.parse(attachments) } catch (e) { @@ -80,6 +82,7 @@ export const TYPE_TRANSFORM_MAP: any = { } return result } + return attachments }, }, [FieldTypes.BOOLEAN]: { From 167dfd39d79aed57e8b2db896f40ed5b608555de Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 4 May 2023 13:32:17 +0100 Subject: [PATCH 214/521] fix ts build --- packages/backend-core/src/redis/redis.ts | 3 +-- packages/server/src/api/routes/public/index.ts | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/redis/redis.ts b/packages/backend-core/src/redis/redis.ts index ecc83167dd..2d54b51a9f 100644 --- a/packages/backend-core/src/redis/redis.ts +++ b/packages/backend-core/src/redis/redis.ts @@ -9,11 +9,10 @@ import { SelectableDatabase, } from "./utils" import * as timers from "../timers" -import environment from "../environment" const RETRY_PERIOD_MS = 2000 const STARTUP_TIMEOUT_MS = 5000 -const CLUSTERED = environment.REDIS_CLUSTERED +const CLUSTERED = env.REDIS_CLUSTERED const DEFAULT_SELECT_DB = SelectableDatabase.DEFAULT // for testing just generate the client once diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts index 5f93732a06..107287348c 100644 --- a/packages/server/src/api/routes/public/index.ts +++ b/packages/server/src/api/routes/public/index.ts @@ -47,6 +47,7 @@ if (!env.isTest()) { if (!env.REDIS_CLUSTERED) { // Can't set direct redis db in clustered env + // @ts-ignore options.database = 1 } } From 41c131050ce9f9e8b86f432ae9af60251cc9d100 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 4 May 2023 13:43:53 +0100 Subject: [PATCH 215/521] lint --- packages/server/src/api/routes/public/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts index 107287348c..bed798f75b 100644 --- a/packages/server/src/api/routes/public/index.ts +++ b/packages/server/src/api/routes/public/index.ts @@ -42,7 +42,8 @@ if (!env.isTest()) { host: REDIS_OPTS.host, port: REDIS_OPTS.port, }, - password: REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password, + password: + REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password, } if (!env.REDIS_CLUSTERED) { From 2086b5d5ddee1e9061107e7e2b958097382154d8 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 4 May 2023 13:33:20 +0000 Subject: [PATCH 216/521] v2.6.2 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 4a716b4ca8..17c0ec2a3b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.1", + "version": "2.6.2", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ee5a62eb0c..1ce7092e16 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.1", + "version": "2.6.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.6.1", + "@budibase/types": "^2.6.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 0964dffb3b..efe82dcce2 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.6.1", + "version": "2.6.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.6.1", - "@budibase/string-templates": "^2.6.1", + "@budibase/shared-core": "^2.6.2", + "@budibase/string-templates": "^2.6.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 ce9d5bcfdf..16cde45ed2 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.1", + "version": "2.6.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.1", - "@budibase/frontend-core": "^2.6.1", - "@budibase/shared-core": "^2.6.1", - "@budibase/string-templates": "^2.6.1", + "@budibase/bbui": "^2.6.2", + "@budibase/frontend-core": "^2.6.2", + "@budibase/shared-core": "^2.6.2", + "@budibase/string-templates": "^2.6.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 016d91c63f..fe4c12e59f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.1", + "version": "2.6.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.6.1", - "@budibase/string-templates": "^2.6.1", - "@budibase/types": "^2.6.1", + "@budibase/backend-core": "^2.6.2", + "@budibase/string-templates": "^2.6.2", + "@budibase/types": "^2.6.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 f7df964b19..f56f753694 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.1", + "version": "2.6.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.6.1", - "@budibase/frontend-core": "^2.6.1", - "@budibase/shared-core": "^2.6.1", - "@budibase/string-templates": "^2.6.1", - "@budibase/types": "^2.6.1", + "@budibase/bbui": "^2.6.2", + "@budibase/frontend-core": "^2.6.2", + "@budibase/shared-core": "^2.6.2", + "@budibase/string-templates": "^2.6.2", + "@budibase/types": "^2.6.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 9fe490f0d9..1742619a80 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.1", + "version": "2.6.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.6.1", - "@budibase/shared-core": "^2.6.1", + "@budibase/bbui": "^2.6.2", + "@budibase/shared-core": "^2.6.2", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0562aef2f0..bf37a7f72c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.1", + "version": "2.6.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 3029ff9b63..34da1f4f36 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.1", + "version": "2.6.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.6.1", - "@budibase/client": "^2.6.1", + "@budibase/backend-core": "^2.6.2", + "@budibase/client": "^2.6.2", "@budibase/pro": "2.6.1", - "@budibase/shared-core": "^2.6.1", - "@budibase/string-templates": "^2.6.1", - "@budibase/types": "^2.6.1", + "@budibase/shared-core": "^2.6.2", + "@budibase/string-templates": "^2.6.2", + "@budibase/types": "^2.6.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 e34cb2f79a..148ec87ad9 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.1", + "version": "2.6.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.6.1" + "@budibase/types": "^2.6.2" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d7bfd47c05..5e553eb7d7 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.1", + "version": "2.6.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 0fb3ba19ec..12d4fedace 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.1", + "version": "2.6.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 d794854093..7cc88e3a05 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.1", + "version": "2.6.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.6.1", + "@budibase/backend-core": "^2.6.2", "@budibase/pro": "2.6.1", - "@budibase/string-templates": "^2.6.1", - "@budibase/types": "^2.6.1", + "@budibase/string-templates": "^2.6.2", + "@budibase/types": "^2.6.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 303a029184b05998111be56197ba0871711daedd Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 4 May 2023 13:34:48 +0000 Subject: [PATCH 217/521] Update pro version to 2.6.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 34da1f4f36..7cbc842a4f 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.6.2", "@budibase/client": "^2.6.2", - "@budibase/pro": "2.6.1", + "@budibase/pro": "2.6.2", "@budibase/shared-core": "^2.6.2", "@budibase/string-templates": "^2.6.2", "@budibase/types": "^2.6.2", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7cc88e3a05..d63143d75b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.2", - "@budibase/pro": "2.6.1", + "@budibase/pro": "2.6.2", "@budibase/string-templates": "^2.6.2", "@budibase/types": "^2.6.2", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index c3e31e6ee6..a43a6c5b13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.0.tgz#ac93023ac4b3a5f8c7f39b2ed6240091b084c625" - integrity sha512-SBIh/TtT40XAUiF7b+9gEkShzbsWJWvCoti7w4YqrujsvVdbYsrwV8yY/FqaCAiHN4hlAXOEcYmF6lgK2g1Rjg== +"@budibase/pro@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.1.tgz#35e9f100424b68320af95e8b900c547053cd49d3" + integrity sha512-gAHSKzvV2WKQWIatg0dqm0uzc4Y/j4ePwN3Ku1m4MMHRDdHtX/YHxH6VVdfMbJ5HG6jlnwoqkFLTb7p25vSUkQ== dependencies: - "@budibase/backend-core" "2.6.0" + "@budibase/backend-core" "2.6.1" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.0" + "@budibase/types" "2.6.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 5cf0e57eec977074c1c7e804b56d85ad2465f405 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 4 May 2023 16:01:34 +0100 Subject: [PATCH 218/521] Feedback updates and a fix pass the current query after updating a user invite --- .../_components/BuilderSidePanel.svelte | 43 ++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte index 5b35e65ed9..9dce1fdf9b 100644 --- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte @@ -28,6 +28,10 @@ let inviting = false let searchFocus = false + // Initially filter entities without app access + // Show all when false + let filterByAppAccess = true + let appInvites = [] let filteredInvites = [] let filteredUsers = [] @@ -58,7 +62,7 @@ appInvites = await getInvites() //On Focus behaviour - if (searchFocus && !query) { + if (!filterByAppAccess && !query) { filteredInvites = appInvites.length > 100 ? appInvites.slice(0, 100) : [...appInvites] return @@ -66,14 +70,17 @@ filteredInvites = appInvites.filter(invite => { const inviteInfo = invite.info?.apps - if ((!query || query == "") && inviteInfo && prodAppId) { + if (!query && inviteInfo && prodAppId) { return Object.keys(inviteInfo).includes(prodAppId) } return invite.email.includes(query) }) } - $: searchFocus, prodAppId, filterInvites(query) + $: filterByAppAccess, prodAppId, filterInvites(query) + $: if (searchFocus === true) { + filterByAppAccess = false + } const usersFetch = fetchData({ API, @@ -92,9 +99,9 @@ } await usersFetch.update({ query: { - appId: query || searchFocus ? null : prodAppId, + appId: query || !filterByAppAccess ? null : prodAppId, email: query, - paginated: query || searchFocus ? null : false, + paginated: query || !filterByAppAccess ? null : false, }, }) await usersFetch.refresh() @@ -120,7 +127,12 @@ } const debouncedUpdateFetch = Utils.debounce(searchUsers, 250) - $: debouncedUpdateFetch(query, $store.builderSidePanel, loaded, searchFocus) + $: debouncedUpdateFetch( + query, + $store.builderSidePanel, + loaded, + filterByAppAccess + ) const updateAppUser = async (user, role) => { if (!prodAppId) { @@ -196,7 +208,7 @@ const searchGroups = (userGroups, query) => { let filterGroups = - query?.length || searchFocus + query?.length || !filterByAppAccess ? userGroups : getAppGroups(userGroups, prodAppId) return filterGroups @@ -228,7 +240,7 @@ } // Adds the 'role' attribute and sets it to the current app. - $: enrichedGroups = getEnrichedGroups($groups, searchFocus) + $: enrichedGroups = getEnrichedGroups($groups, filterByAppAccess) $: filteredGroups = searchGroups(enrichedGroups, query) $: groupUsers = buildGroupUsers(filteredGroups, filteredUsers) $: allUsers = [...filteredUsers, ...groupUsers] @@ -240,7 +252,7 @@ specific roles for the app. */ const buildGroupUsers = (userGroups, filteredUsers) => { - if (query || searchFocus) { + if (query || !filterByAppAccess) { return [] } // Must exclude users who have explicit privileges @@ -335,12 +347,12 @@ [prodAppId]: role, }, }) - await filterInvites() + await filterInvites(query) } const onUninviteAppUser = async invite => { await uninviteAppUser(invite) - await filterInvites() + await filterInvites(query) } // Purge only the app from the invite or recind the invite if only 1 app remains? @@ -440,19 +452,20 @@ { - if (searchFocus) { - searchFocus = false + if (!filterByAppAccess) { + filterByAppAccess = true } if (!query) { return } query = null userOnboardResponse = null + filterByAppAccess = true }} > - + From 0d7959f720310832bb13a6c33ecbb987bd8d176b Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 4 May 2023 17:05:36 +0100 Subject: [PATCH 219/521] Fixing some un-identified listeners, queue messages not being correctly printed, also improving the mechanism for detecting if in the main thread or not. --- packages/backend-core/src/queue/listeners.ts | 6 ++++++ packages/server/src/environment.ts | 8 +------- packages/server/src/threads/index.ts | 6 ++++++ packages/server/src/threads/utils.ts | 4 +--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/backend-core/src/queue/listeners.ts b/packages/backend-core/src/queue/listeners.ts index e1975b5d06..331b690fe9 100644 --- a/packages/backend-core/src/queue/listeners.ts +++ b/packages/backend-core/src/queue/listeners.ts @@ -40,6 +40,12 @@ function logging(queue: Queue, jobQueue: JobQueue) { case JobQueue.APP_BACKUP: eventType = "app-backup-event" break + case JobQueue.AUDIT_LOG: + eventType = "audit-log-event" + break + case JobQueue.SYSTEM_EVENT_QUEUE: + eventType = "system-event" + break } if (process.env.NODE_DEBUG?.includes("bull")) { queue diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts index bcf9488777..2265d7e75d 100644 --- a/packages/server/src/environment.ts +++ b/packages/server/src/environment.ts @@ -34,8 +34,6 @@ function parseIntSafe(number?: string) { } } -let inThread = false - const environment = { // important - prefer app port to generic port PORT: process.env.APP_PORT || process.env.PORT, @@ -95,12 +93,8 @@ const environment = { isProd: () => { return !isDev() }, - // used to check if already in a thread, don't thread further - setInThread: () => { - inThread = true - }, isInThread: () => { - return inThread + return process.env.FORKED_PROCESS }, } diff --git a/packages/server/src/threads/index.ts b/packages/server/src/threads/index.ts index 0723edad34..6876f1a07c 100644 --- a/packages/server/src/threads/index.ts +++ b/packages/server/src/threads/index.ts @@ -39,6 +39,12 @@ export class Thread { const workerOpts: any = { autoStart: true, maxConcurrentWorkers: this.count, + workerOptions: { + env: { + ...process.env, + FORKED_PROCESS: "1", + }, + }, } if (opts.timeoutMs) { this.timeoutMs = opts.timeoutMs diff --git a/packages/server/src/threads/utils.ts b/packages/server/src/threads/utils.ts index 5caaeb83d7..37c7a6d3f9 100644 --- a/packages/server/src/threads/utils.ts +++ b/packages/server/src/threads/utils.ts @@ -25,11 +25,9 @@ function makeVariableKey(queryId: string, variable: string) { export function threadSetup() { // don't run this if not threading - if (env.isTest() || env.DISABLE_THREADING) { + if (env.isTest() || env.DISABLE_THREADING || !env.isInThread()) { return } - // when thread starts, make sure it is recorded - env.setInThread() db.init() } From b790a1177e73764b69c2798e308deae668f908a2 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Fri, 5 May 2023 07:50:01 +0100 Subject: [PATCH 220/521] Don't validate empty options picker (#10302) --- packages/server/src/api/controllers/row/utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts index a7c467ea61..f6a87dd24c 100644 --- a/packages/server/src/api/controllers/row/utils.ts +++ b/packages/server/src/api/controllers/row/utils.ts @@ -69,9 +69,9 @@ export async function validate({ if (type === FieldTypes.FORMULA || column.autocolumn) { continue } - // special case for options, need to always allow unselected (null) + // special case for options, need to always allow unselected (empty) if (type === FieldTypes.OPTIONS && constraints.inclusion) { - constraints.inclusion.push(null) + constraints.inclusion.push(null, "") } let res From 0aa270ad0acbe953fb3536e8af3546f535c51302 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 5 May 2023 06:58:10 +0000 Subject: [PATCH 221/521] v2.6.3 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 17c0ec2a3b..d79ed9b8d3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.2", + "version": "2.6.3", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 1ce7092e16..1b8627a291 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.2", + "version": "2.6.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.6.2", + "@budibase/types": "^2.6.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 efe82dcce2..24b910a8a3 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.6.2", + "version": "2.6.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.6.2", - "@budibase/string-templates": "^2.6.2", + "@budibase/shared-core": "^2.6.3", + "@budibase/string-templates": "^2.6.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 16cde45ed2..176881cebc 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.2", + "version": "2.6.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.2", - "@budibase/frontend-core": "^2.6.2", - "@budibase/shared-core": "^2.6.2", - "@budibase/string-templates": "^2.6.2", + "@budibase/bbui": "^2.6.3", + "@budibase/frontend-core": "^2.6.3", + "@budibase/shared-core": "^2.6.3", + "@budibase/string-templates": "^2.6.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 fe4c12e59f..fb20a1e400 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.2", + "version": "2.6.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.6.2", - "@budibase/string-templates": "^2.6.2", - "@budibase/types": "^2.6.2", + "@budibase/backend-core": "^2.6.3", + "@budibase/string-templates": "^2.6.3", + "@budibase/types": "^2.6.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 f56f753694..dd609b26e5 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.2", + "version": "2.6.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.6.2", - "@budibase/frontend-core": "^2.6.2", - "@budibase/shared-core": "^2.6.2", - "@budibase/string-templates": "^2.6.2", - "@budibase/types": "^2.6.2", + "@budibase/bbui": "^2.6.3", + "@budibase/frontend-core": "^2.6.3", + "@budibase/shared-core": "^2.6.3", + "@budibase/string-templates": "^2.6.3", + "@budibase/types": "^2.6.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 1742619a80..2a75605fbf 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.2", + "version": "2.6.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.6.2", - "@budibase/shared-core": "^2.6.2", + "@budibase/bbui": "^2.6.3", + "@budibase/shared-core": "^2.6.3", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index bf37a7f72c..9cc2f8eeec 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.2", + "version": "2.6.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 7cbc842a4f..0e2c4e1c58 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.2", + "version": "2.6.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.6.2", - "@budibase/client": "^2.6.2", + "@budibase/backend-core": "^2.6.3", + "@budibase/client": "^2.6.3", "@budibase/pro": "2.6.2", - "@budibase/shared-core": "^2.6.2", - "@budibase/string-templates": "^2.6.2", - "@budibase/types": "^2.6.2", + "@budibase/shared-core": "^2.6.3", + "@budibase/string-templates": "^2.6.3", + "@budibase/types": "^2.6.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 148ec87ad9..9d1eff2ef9 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.2", + "version": "2.6.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.6.2" + "@budibase/types": "^2.6.3" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 5e553eb7d7..c1161a0b81 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.2", + "version": "2.6.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 12d4fedace..f3338889b0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.2", + "version": "2.6.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 d63143d75b..f25bc2ae6f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.2", + "version": "2.6.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.6.2", + "@budibase/backend-core": "^2.6.3", "@budibase/pro": "2.6.2", - "@budibase/string-templates": "^2.6.2", - "@budibase/types": "^2.6.2", + "@budibase/string-templates": "^2.6.3", + "@budibase/types": "^2.6.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 541c5ef1c2ef99d54c0b07be1c722ee9f7787448 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 5 May 2023 06:59:33 +0000 Subject: [PATCH 222/521] Update pro version to 2.6.3 --- 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 0e2c4e1c58..ded10fc8fd 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.6.3", "@budibase/client": "^2.6.3", - "@budibase/pro": "2.6.2", + "@budibase/pro": "2.6.3", "@budibase/shared-core": "^2.6.3", "@budibase/string-templates": "^2.6.3", "@budibase/types": "^2.6.3", diff --git a/packages/worker/package.json b/packages/worker/package.json index f25bc2ae6f..ca62a606c3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.3", - "@budibase/pro": "2.6.2", + "@budibase/pro": "2.6.3", "@budibase/string-templates": "^2.6.3", "@budibase/types": "^2.6.3", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index a43a6c5b13..491e524344 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.1.tgz#35e9f100424b68320af95e8b900c547053cd49d3" - integrity sha512-gAHSKzvV2WKQWIatg0dqm0uzc4Y/j4ePwN3Ku1m4MMHRDdHtX/YHxH6VVdfMbJ5HG6jlnwoqkFLTb7p25vSUkQ== +"@budibase/pro@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.2.tgz#b30602c740c244a2cfbcc962af99140d936311b2" + integrity sha512-QXNUitikX6ygCr3pSEkAOx9Yw6LsXZCrwgyVRVA7JyGggVjVFn1zOU23/OfD6E9zhj9bMOQpoKTCBAwuvSSICQ== dependencies: - "@budibase/backend-core" "2.6.1" + "@budibase/backend-core" "2.6.2" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.1" + "@budibase/types" "2.6.2" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 1ec5df1299a7d89887bf13d72a954ecd10da9fd7 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 5 May 2023 08:56:45 +0100 Subject: [PATCH 223/521] Use magic icon for auto column and show icons in hide columns button --- .../grid/controls/HideColumnsButton.svelte | 24 +++++++++++++++---- .../src/components/grid/lib/utils.js | 3 +++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte index 79a773347b..691d879ace 100644 --- a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte +++ b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte @@ -1,6 +1,7 @@ - + + + + + From 5b0ba593b86ae43a53941d30258006edc390ec85 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 5 May 2023 09:18:00 +0100 Subject: [PATCH 225/521] Move modal consideration CSS selector up a few levels to underlay to prevent modal close clicks triggering external handlers --- packages/bbui/src/Actions/click_outside.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/bbui/src/Actions/click_outside.js b/packages/bbui/src/Actions/click_outside.js index add1378812..1961dca47c 100644 --- a/packages/bbui/src/Actions/click_outside.js +++ b/packages/bbui/src/Actions/click_outside.js @@ -26,8 +26,8 @@ const handleClick = event => { } // Ignore clicks for modals, unless the handler is registered from a modal - const sourceInModal = handler.anchor.closest(".spectrum-Modal") != null - const clickInModal = event.target.closest(".spectrum-Modal") != null + const sourceInModal = handler.anchor.closest(".spectrum-Underlay") != null + const clickInModal = event.target.closest(".spectrum-Underlay") != null if (clickInModal && !sourceInModal) { return } From b0ff61c9ecb8f9faffdd0136230a7dac792cd06b Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 5 May 2023 09:24:57 +0100 Subject: [PATCH 226/521] Feedback update. Console.error to logging.logalert --- packages/server/src/utilities/rowProcessor/map.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts index 669223b302..808b16178d 100644 --- a/packages/server/src/utilities/rowProcessor/map.ts +++ b/packages/server/src/utilities/rowProcessor/map.ts @@ -1,5 +1,6 @@ // @ts-nocheck import { FieldTypes } from "../../constants" +import { logging } from "@budibase/backend-core" /** * A map of how we convert various properties in rows to each other based on the row type. @@ -78,7 +79,7 @@ export const TYPE_TRANSFORM_MAP: any = { try { result = JSON.parse(attachments) } catch (e) { - console.error("Could not parse attachments", e) + logging.logAlert("Could not parse attachments", e) } return result } From 86ce8eb831c60315cdfaee75c6da71ceb576842a Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 5 May 2023 10:45:34 +0100 Subject: [PATCH 227/521] Fix table ID being passed in to access modal --- .../backend/DataTable/buttons/grid/GridFilterButton.svelte | 6 +++--- .../DataTable/buttons/grid/GridManageAccessButton.svelte | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridFilterButton.svelte index aff98deaaf..2283862303 100644 --- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridFilterButton.svelte +++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridFilterButton.svelte @@ -2,19 +2,19 @@ import TableFilterButton from "../TableFilterButton.svelte" import { getContext } from "svelte" - const { columns, config, filter, table } = getContext("grid") + const { columns, tableId, filter, table } = getContext("grid") const onFilter = e => { filter.set(e.detail || []) } -{#key $config.tableId} +{#key $tableId} {/key} diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte index d41d0a1a25..154007950a 100644 --- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte +++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte @@ -2,7 +2,7 @@ import ManageAccessButton from "../ManageAccessButton.svelte" import { getContext } from "svelte" - const { config } = getContext("grid") + const { tableId } = getContext("grid") - + From 438afa03cf8cd98c449f541eac742ba4ab0bd03d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 5 May 2023 10:46:36 +0100 Subject: [PATCH 228/521] Remove commented out code --- .../src/components/grid/controls/HideColumnsButton.svelte | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte index 691d879ace..fb66b106c9 100644 --- a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte +++ b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte @@ -66,9 +66,7 @@ {/if} {#each $columns as column}
- - {column.label}
Date: Fri, 5 May 2023 10:47:43 +0000 Subject: [PATCH 229/521] v2.6.4 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index d79ed9b8d3..85dc6dfb4c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.3", + "version": "2.6.4", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 1b8627a291..cfe74a66bd 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.3", + "version": "2.6.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.6.3", + "@budibase/types": "^2.6.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 24b910a8a3..907c85c4fa 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.6.3", + "version": "2.6.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.6.3", - "@budibase/string-templates": "^2.6.3", + "@budibase/shared-core": "^2.6.4", + "@budibase/string-templates": "^2.6.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 176881cebc..688da24130 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.3", + "version": "2.6.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.3", - "@budibase/frontend-core": "^2.6.3", - "@budibase/shared-core": "^2.6.3", - "@budibase/string-templates": "^2.6.3", + "@budibase/bbui": "^2.6.4", + "@budibase/frontend-core": "^2.6.4", + "@budibase/shared-core": "^2.6.4", + "@budibase/string-templates": "^2.6.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 fb20a1e400..4cc909a927 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.3", + "version": "2.6.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.6.3", - "@budibase/string-templates": "^2.6.3", - "@budibase/types": "^2.6.3", + "@budibase/backend-core": "^2.6.4", + "@budibase/string-templates": "^2.6.4", + "@budibase/types": "^2.6.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 dd609b26e5..f88cd69202 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.3", + "version": "2.6.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.6.3", - "@budibase/frontend-core": "^2.6.3", - "@budibase/shared-core": "^2.6.3", - "@budibase/string-templates": "^2.6.3", - "@budibase/types": "^2.6.3", + "@budibase/bbui": "^2.6.4", + "@budibase/frontend-core": "^2.6.4", + "@budibase/shared-core": "^2.6.4", + "@budibase/string-templates": "^2.6.4", + "@budibase/types": "^2.6.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 2a75605fbf..f4afebac5a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.3", + "version": "2.6.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.6.3", - "@budibase/shared-core": "^2.6.3", + "@budibase/bbui": "^2.6.4", + "@budibase/shared-core": "^2.6.4", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 9cc2f8eeec..c6785e0e4f 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.3", + "version": "2.6.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 ded10fc8fd..127f87530d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.3", + "version": "2.6.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.6.3", - "@budibase/client": "^2.6.3", + "@budibase/backend-core": "^2.6.4", + "@budibase/client": "^2.6.4", "@budibase/pro": "2.6.3", - "@budibase/shared-core": "^2.6.3", - "@budibase/string-templates": "^2.6.3", - "@budibase/types": "^2.6.3", + "@budibase/shared-core": "^2.6.4", + "@budibase/string-templates": "^2.6.4", + "@budibase/types": "^2.6.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 9d1eff2ef9..d059a798f7 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.3", + "version": "2.6.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.6.3" + "@budibase/types": "^2.6.4" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index c1161a0b81..cdf778b471 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.3", + "version": "2.6.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 f3338889b0..c450d7d0a6 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.3", + "version": "2.6.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 ca62a606c3..7d401d810e 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.3", + "version": "2.6.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.6.3", + "@budibase/backend-core": "^2.6.4", "@budibase/pro": "2.6.3", - "@budibase/string-templates": "^2.6.3", - "@budibase/types": "^2.6.3", + "@budibase/string-templates": "^2.6.4", + "@budibase/types": "^2.6.4", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 488ce6c072b8cef269e785003e16bd250ba6cc2a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 5 May 2023 10:49:18 +0000 Subject: [PATCH 230/521] Update pro version to 2.6.4 --- 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 127f87530d..9621586f3e 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.6.4", "@budibase/client": "^2.6.4", - "@budibase/pro": "2.6.3", + "@budibase/pro": "2.6.4", "@budibase/shared-core": "^2.6.4", "@budibase/string-templates": "^2.6.4", "@budibase/types": "^2.6.4", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7d401d810e..690e6ac73b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.4", - "@budibase/pro": "2.6.3", + "@budibase/pro": "2.6.4", "@budibase/string-templates": "^2.6.4", "@budibase/types": "^2.6.4", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 491e524344..583adac597 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.2.tgz#b30602c740c244a2cfbcc962af99140d936311b2" - integrity sha512-QXNUitikX6ygCr3pSEkAOx9Yw6LsXZCrwgyVRVA7JyGggVjVFn1zOU23/OfD6E9zhj9bMOQpoKTCBAwuvSSICQ== +"@budibase/pro@2.6.3": + version "2.6.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.3.tgz#c978a50566cd269256c8e3840fe549f768b05408" + integrity sha512-YhUR3afV34JmCO0DMFj4682fIaf06GfVmqz8U68j5MviT7JSctiqfFwF4xJaIYJGrLiXogQATFIEE/mLBBv0pA== dependencies: - "@budibase/backend-core" "2.6.2" + "@budibase/backend-core" "2.6.3" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.2" + "@budibase/types" "2.6.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 4cd5b39c3a219d28f416a879d166de345c6f314b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 May 2023 10:55:55 +0000 Subject: [PATCH 231/521] v2.5.10-alpha.2 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index c226dea49e..3bd09ccb88 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.10-alpha.1", + "version": "2.5.10-alpha.2", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b66112e8de..e3369150a7 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.10-alpha.1", + "version": "2.5.10-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.10-alpha.1", + "@budibase/types": "2.5.10-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 0e99b34384..55e3916304 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.10-alpha.1", + "version": "2.5.10-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.10-alpha.1", - "@budibase/string-templates": "2.5.10-alpha.1", + "@budibase/shared-core": "2.5.10-alpha.2", + "@budibase/string-templates": "2.5.10-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 9607e51344..8fe3d48a15 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.10-alpha.1", + "version": "2.5.10-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.10-alpha.1", - "@budibase/frontend-core": "2.5.10-alpha.1", - "@budibase/shared-core": "2.5.10-alpha.1", - "@budibase/string-templates": "2.5.10-alpha.1", + "@budibase/bbui": "2.5.10-alpha.2", + "@budibase/frontend-core": "2.5.10-alpha.2", + "@budibase/shared-core": "2.5.10-alpha.2", + "@budibase/string-templates": "2.5.10-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 3d663babd5..110189d822 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.10-alpha.1", + "version": "2.5.10-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.10-alpha.1", - "@budibase/string-templates": "2.5.10-alpha.1", - "@budibase/types": "2.5.10-alpha.1", + "@budibase/backend-core": "2.5.10-alpha.2", + "@budibase/string-templates": "2.5.10-alpha.2", + "@budibase/types": "2.5.10-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 4016899f8c..7e61138442 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.10-alpha.1", + "version": "2.5.10-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.10-alpha.1", - "@budibase/frontend-core": "2.5.10-alpha.1", - "@budibase/shared-core": "2.5.10-alpha.1", - "@budibase/string-templates": "2.5.10-alpha.1", - "@budibase/types": "2.5.10-alpha.1", + "@budibase/bbui": "2.5.10-alpha.2", + "@budibase/frontend-core": "2.5.10-alpha.2", + "@budibase/shared-core": "2.5.10-alpha.2", + "@budibase/string-templates": "2.5.10-alpha.2", + "@budibase/types": "2.5.10-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 937574814e..1ec879c6da 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.10-alpha.1", + "version": "2.5.10-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.10-alpha.1", - "@budibase/shared-core": "2.5.10-alpha.1", + "@budibase/bbui": "2.5.10-alpha.2", + "@budibase/shared-core": "2.5.10-alpha.2", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0843bd509f..2a4b6f0577 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.10-alpha.1", + "version": "2.5.10-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 d0ff56531b..e968d846ce 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.10-alpha.1", + "version": "2.5.10-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.10-alpha.1", - "@budibase/client": "2.5.10-alpha.1", + "@budibase/backend-core": "2.5.10-alpha.2", + "@budibase/client": "2.5.10-alpha.2", "@budibase/pro": "2.5.10-alpha.1", - "@budibase/shared-core": "2.5.10-alpha.1", - "@budibase/string-templates": "2.5.10-alpha.1", - "@budibase/types": "2.5.10-alpha.1", + "@budibase/shared-core": "2.5.10-alpha.2", + "@budibase/string-templates": "2.5.10-alpha.2", + "@budibase/types": "2.5.10-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 2b8f75f738..278668c16c 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.10-alpha.1", + "version": "2.5.10-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.10-alpha.1" + "@budibase/types": "2.5.10-alpha.2" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 3349aad7ba..b5d9c4dec0 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.10-alpha.1", + "version": "2.5.10-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 4367270c85..4b043a8ec1 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.10-alpha.1", + "version": "2.5.10-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 165689cf7c..d216c20fc8 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.10-alpha.1", + "version": "2.5.10-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.10-alpha.1", + "@budibase/backend-core": "2.5.10-alpha.2", "@budibase/pro": "2.5.10-alpha.1", - "@budibase/string-templates": "2.5.10-alpha.1", - "@budibase/types": "2.5.10-alpha.1", + "@budibase/string-templates": "2.5.10-alpha.2", + "@budibase/types": "2.5.10-alpha.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 87f5c9353ac5bd033ad631f25825769943fbc0eb Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 May 2023 10:57:40 +0000 Subject: [PATCH 232/521] Update pro version to 2.5.10-alpha.2 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index e968d846ce..7f29b46ab3 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.10-alpha.2", "@budibase/client": "2.5.10-alpha.2", - "@budibase/pro": "2.5.10-alpha.1", + "@budibase/pro": "2.5.10-alpha.2", "@budibase/shared-core": "2.5.10-alpha.2", "@budibase/string-templates": "2.5.10-alpha.2", "@budibase/types": "2.5.10-alpha.2", diff --git a/packages/worker/package.json b/packages/worker/package.json index d216c20fc8..3fb2e395a9 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.10-alpha.2", - "@budibase/pro": "2.5.10-alpha.1", + "@budibase/pro": "2.5.10-alpha.2", "@budibase/string-templates": "2.5.10-alpha.2", "@budibase/types": "2.5.10-alpha.2", "@koa/router": "8.0.8", From eb5e962e65613d103f405f199f7514a4b5023202 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 5 May 2023 11:18:39 +0000 Subject: [PATCH 233/521] v2.6.5 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 85dc6dfb4c..28218ad86c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.4", + "version": "2.6.5", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index cfe74a66bd..1ba2a0cbb2 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.4", + "version": "2.6.5", "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.6.4", + "@budibase/types": "^2.6.5", "@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 907c85c4fa..513b64fe1a 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.6.4", + "version": "2.6.5", "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.6.4", - "@budibase/string-templates": "^2.6.4", + "@budibase/shared-core": "^2.6.5", + "@budibase/string-templates": "^2.6.5", "@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 688da24130..7da9a8b2b7 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.4", + "version": "2.6.5", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.4", - "@budibase/frontend-core": "^2.6.4", - "@budibase/shared-core": "^2.6.4", - "@budibase/string-templates": "^2.6.4", + "@budibase/bbui": "^2.6.5", + "@budibase/frontend-core": "^2.6.5", + "@budibase/shared-core": "^2.6.5", + "@budibase/string-templates": "^2.6.5", "@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 4cc909a927..ce91f44ec5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.4", + "version": "2.6.5", "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.6.4", - "@budibase/string-templates": "^2.6.4", - "@budibase/types": "^2.6.4", + "@budibase/backend-core": "^2.6.5", + "@budibase/string-templates": "^2.6.5", + "@budibase/types": "^2.6.5", "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 f88cd69202..9a092bcf39 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.4", + "version": "2.6.5", "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.6.4", - "@budibase/frontend-core": "^2.6.4", - "@budibase/shared-core": "^2.6.4", - "@budibase/string-templates": "^2.6.4", - "@budibase/types": "^2.6.4", + "@budibase/bbui": "^2.6.5", + "@budibase/frontend-core": "^2.6.5", + "@budibase/shared-core": "^2.6.5", + "@budibase/string-templates": "^2.6.5", + "@budibase/types": "^2.6.5", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index f4afebac5a..45427c87ee 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.4", + "version": "2.6.5", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.6.4", - "@budibase/shared-core": "^2.6.4", + "@budibase/bbui": "^2.6.5", + "@budibase/shared-core": "^2.6.5", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c6785e0e4f..3a66811f86 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.4", + "version": "2.6.5", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9621586f3e..f2d32f0415 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.4", + "version": "2.6.5", "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.6.4", - "@budibase/client": "^2.6.4", + "@budibase/backend-core": "^2.6.5", + "@budibase/client": "^2.6.5", "@budibase/pro": "2.6.4", - "@budibase/shared-core": "^2.6.4", - "@budibase/string-templates": "^2.6.4", - "@budibase/types": "^2.6.4", + "@budibase/shared-core": "^2.6.5", + "@budibase/string-templates": "^2.6.5", + "@budibase/types": "^2.6.5", "@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 d059a798f7..4ca3344cee 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.4", + "version": "2.6.5", "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.6.4" + "@budibase/types": "^2.6.5" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index cdf778b471..b5d7f23a7d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.4", + "version": "2.6.5", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index c450d7d0a6..10a6fe210f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.4", + "version": "2.6.5", "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 690e6ac73b..5f6418ba93 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.4", + "version": "2.6.5", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.6.4", + "@budibase/backend-core": "^2.6.5", "@budibase/pro": "2.6.4", - "@budibase/string-templates": "^2.6.4", - "@budibase/types": "^2.6.4", + "@budibase/string-templates": "^2.6.5", + "@budibase/types": "^2.6.5", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 58e2ea7c6c2e3e4d7b1d057148b6ef91ba87fb5e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 May 2023 11:19:15 +0000 Subject: [PATCH 234/521] v2.5.10-alpha.3 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 3bd09ccb88..de5e61bf5c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.10-alpha.2", + "version": "2.5.10-alpha.3", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index e3369150a7..52af631b3a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.10-alpha.2", + "version": "2.5.10-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.10-alpha.2", + "@budibase/types": "2.5.10-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 55e3916304..8f74e41cb3 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.10-alpha.2", + "version": "2.5.10-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.10-alpha.2", - "@budibase/string-templates": "2.5.10-alpha.2", + "@budibase/shared-core": "2.5.10-alpha.3", + "@budibase/string-templates": "2.5.10-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 8fe3d48a15..bfed220ef4 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.10-alpha.2", + "version": "2.5.10-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.10-alpha.2", - "@budibase/frontend-core": "2.5.10-alpha.2", - "@budibase/shared-core": "2.5.10-alpha.2", - "@budibase/string-templates": "2.5.10-alpha.2", + "@budibase/bbui": "2.5.10-alpha.3", + "@budibase/frontend-core": "2.5.10-alpha.3", + "@budibase/shared-core": "2.5.10-alpha.3", + "@budibase/string-templates": "2.5.10-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 110189d822..cc48c4d17a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.10-alpha.2", + "version": "2.5.10-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.10-alpha.2", - "@budibase/string-templates": "2.5.10-alpha.2", - "@budibase/types": "2.5.10-alpha.2", + "@budibase/backend-core": "2.5.10-alpha.3", + "@budibase/string-templates": "2.5.10-alpha.3", + "@budibase/types": "2.5.10-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 7e61138442..3c886bccc8 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.10-alpha.2", + "version": "2.5.10-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.10-alpha.2", - "@budibase/frontend-core": "2.5.10-alpha.2", - "@budibase/shared-core": "2.5.10-alpha.2", - "@budibase/string-templates": "2.5.10-alpha.2", - "@budibase/types": "2.5.10-alpha.2", + "@budibase/bbui": "2.5.10-alpha.3", + "@budibase/frontend-core": "2.5.10-alpha.3", + "@budibase/shared-core": "2.5.10-alpha.3", + "@budibase/string-templates": "2.5.10-alpha.3", + "@budibase/types": "2.5.10-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 1ec879c6da..ae2bbbac7a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.10-alpha.2", + "version": "2.5.10-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.10-alpha.2", - "@budibase/shared-core": "2.5.10-alpha.2", + "@budibase/bbui": "2.5.10-alpha.3", + "@budibase/shared-core": "2.5.10-alpha.3", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 2a4b6f0577..79579da1fe 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.10-alpha.2", + "version": "2.5.10-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 7f29b46ab3..0fcaa91803 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.10-alpha.2", + "version": "2.5.10-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.10-alpha.2", - "@budibase/client": "2.5.10-alpha.2", + "@budibase/backend-core": "2.5.10-alpha.3", + "@budibase/client": "2.5.10-alpha.3", "@budibase/pro": "2.5.10-alpha.2", - "@budibase/shared-core": "2.5.10-alpha.2", - "@budibase/string-templates": "2.5.10-alpha.2", - "@budibase/types": "2.5.10-alpha.2", + "@budibase/shared-core": "2.5.10-alpha.3", + "@budibase/string-templates": "2.5.10-alpha.3", + "@budibase/types": "2.5.10-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 278668c16c..518df47dcc 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.10-alpha.2", + "version": "2.5.10-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.10-alpha.2" + "@budibase/types": "2.5.10-alpha.3" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b5d9c4dec0..e74eb2d6d8 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.10-alpha.2", + "version": "2.5.10-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 4b043a8ec1..0fdc75ed65 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.10-alpha.2", + "version": "2.5.10-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 3fb2e395a9..a8f44bc79c 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.10-alpha.2", + "version": "2.5.10-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.10-alpha.2", + "@budibase/backend-core": "2.5.10-alpha.3", "@budibase/pro": "2.5.10-alpha.2", - "@budibase/string-templates": "2.5.10-alpha.2", - "@budibase/types": "2.5.10-alpha.2", + "@budibase/string-templates": "2.5.10-alpha.3", + "@budibase/types": "2.5.10-alpha.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From cd08227d21fb983eb5f1f3f96ef35121a91f7523 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 5 May 2023 11:20:15 +0000 Subject: [PATCH 235/521] Update pro version to 2.6.5 --- 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 f2d32f0415..21f00563c2 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.6.5", "@budibase/client": "^2.6.5", - "@budibase/pro": "2.6.4", + "@budibase/pro": "2.6.5", "@budibase/shared-core": "^2.6.5", "@budibase/string-templates": "^2.6.5", "@budibase/types": "^2.6.5", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5f6418ba93..1d312a7d6d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.5", - "@budibase/pro": "2.6.4", + "@budibase/pro": "2.6.5", "@budibase/string-templates": "^2.6.5", "@budibase/types": "^2.6.5", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 583adac597..d7853ffbd9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.3": - version "2.6.3" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.3.tgz#c978a50566cd269256c8e3840fe549f768b05408" - integrity sha512-YhUR3afV34JmCO0DMFj4682fIaf06GfVmqz8U68j5MviT7JSctiqfFwF4xJaIYJGrLiXogQATFIEE/mLBBv0pA== +"@budibase/pro@2.6.4": + version "2.6.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.4.tgz#b300b401a4615afc250550e9d84151da42ceebc8" + integrity sha512-M8IJDT/RhJuIglV+Nt+3yqtlP6fM+WHcqHQr1PxxkU/dntq4fEwWANLQjV+jsKTOuWd/ZLhngkotf0q/B3C8Fg== dependencies: - "@budibase/backend-core" "2.6.3" + "@budibase/backend-core" "2.6.4" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.3" + "@budibase/types" "2.6.4" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 21ffea56c4128ab100953bde0f5bbc6365b09dac Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 May 2023 11:20:50 +0000 Subject: [PATCH 236/521] Update pro version to 2.5.10-alpha.3 --- 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 0fcaa91803..ab0bf8bea1 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.10-alpha.3", "@budibase/client": "2.5.10-alpha.3", - "@budibase/pro": "2.5.10-alpha.2", + "@budibase/pro": "2.5.10-alpha.3", "@budibase/shared-core": "2.5.10-alpha.3", "@budibase/string-templates": "2.5.10-alpha.3", "@budibase/types": "2.5.10-alpha.3", diff --git a/packages/worker/package.json b/packages/worker/package.json index a8f44bc79c..23c037bfc5 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.10-alpha.3", - "@budibase/pro": "2.5.10-alpha.2", + "@budibase/pro": "2.5.10-alpha.3", "@budibase/string-templates": "2.5.10-alpha.3", "@budibase/types": "2.5.10-alpha.3", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 0e5c80f96a..1882b1d408 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.10-alpha.1": - version "2.5.10-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.1.tgz#9b3241809330860a0c38bcd08a31c8ddfe4f7fe8" - integrity sha512-Bhy9fb0HmfLpmaknfE+qxxRB4X4CWKHho2WMVugqLqzpLIyYJIksNucJgIu4EHPP6By24R0PtcCoJNZNgn6xNw== +"@budibase/pro@2.5.10-alpha.2": + version "2.5.10-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10-alpha.2.tgz#7f3e831748b7b9503e49a1fe49531be030ffbe49" + integrity sha512-bXI6UrFWKrUZLZzTlCRU0fKfnoZvUIAV8IeZREF+AqN0TKx5hlxTmyj4ACoBLy3ABm1+AanMMpg8Bu4kLiue3g== dependencies: - "@budibase/backend-core" "2.5.10-alpha.1" + "@budibase/backend-core" "2.5.10-alpha.2" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.5.10-alpha.1" + "@budibase/types" "2.5.10-alpha.2" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 25b42f0a28f833ec604934214e9c47235e6dc3b6 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Fri, 5 May 2023 12:41:24 +0100 Subject: [PATCH 237/521] Rename Integromat to Make. Update logo. (#10492) --- packages/builder/assets/integromat.png | Bin 26614 -> 0 bytes packages/builder/assets/make.svg | 1 + .../FlowChart/ActionModal.svelte | 2 +- .../FlowChart/ExternalActions.js | 4 ++-- packages/server/src/automations/actions.ts | 6 +++--- .../steps/{integromat.ts => make.ts} | 7 ++++--- packages/types/src/documents/app/automation.ts | 1 + 7 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 packages/builder/assets/integromat.png create mode 100644 packages/builder/assets/make.svg rename packages/server/src/automations/steps/{integromat.ts => make.ts} (93%) diff --git a/packages/builder/assets/integromat.png b/packages/builder/assets/integromat.png deleted file mode 100644 index 1fbbe63e7444ce8a7959293880d85b72d1ae7724..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26614 zcmZsDcR1DW`}jfjEJ9?JsL1Xhn|FjnDI;ZX$Ch=>tb`QFI9UyndC1D%%FI0WD)U(3 z*!-Sz4t>6V{NC5~zI2`Yb&uzM?&p5)^?HSC-BY2aV4;9OAk?aN{(As{5Q$^|CnEvB zKz`*7Lm*aFs{biG^c+TyktUcwN<4NBGdUCYDd58GNY1;ovuB#0HoQz6YofZY{GUG2 z4%5*2%VVNfDJb#?p6S}3As`nS(<|&O>EG_m%?M+38zH-@;BrrNOD;1@huP{&_xY9F zJ)hLM{q`5#Q=_iq8%K*7@G(j(YY613SpVXO7Jt9~cNGG1c41>Wk;^5UFV2!?7%MCu-6oNRI4yLUpREH}qX}^7*3!n;q9jJF7em z6MR!$iEDHDK{b?y7b|mSn~ME0OT#tViTjSTM*?OujJqdY}2df{CPI~k zI?nB9E&-}(>S#|rn+@z@-R2VG*8SNY%lc{M-aqzRn=3BjD%~{ET6iZuNI20o*DUtR zo_R)MpjcE%s>#flhY+AYL&4qL)}MIl3m?Tu36iqz_Y}T~vkI=s*S{s=9~yWMR;~ccV`oeQ(3zZ^SkwOCiiPCOgTv>O_Vr3rRX5q& zEH0a6j(WiwgkQDXy675TMF3vOE+T=oK{!XX$^ZZo%t`?a4-(*{G=(+2 zdg^PV;E#M+x)TxjOD4|X0RBLxLhGr)pJ3JpSfta3=^ULr7gpUr`wxCbkowgp zoA258fdp)3E-o%3-Ag@;)ky`HZ~GP(m^14LZ2Vl^mZE^ zXj=>UF&|ah6Lo~)9$k1?mbg7INseS}N;3Zjm}+yY{%!2OLp3OHHfun;49nC_Xmqq+ z-PHc&&7WTgAOTV51P{qH8sLTe>MSskU{n&j~~_ve-Z%6l #;?N`NzVw*YxQ!DVmItKj1qNG;)yLbR|=5<4q&(7^TkIwelyel+46{WmarBW6(^4+$W?n#*rGRsI|~kY zZHapC=8LsC4d0SL9Bpzd^NeU)m2cooBN#Dz z`0Skpyh*0v7b)a-47cjL5bC8&q7sD@0WzL-y@H2bfIwQQ*U7Dc8f2>5?d8R-PSnbe zzMbYw>-8cL0-3k?Qtr6cJxNVedF>Qgrn&0(jI*QgWeDWy$H%!2F&0Ct4J2-FI`mFd zV~_bz&{D~@a?_FolJ+r}+A3Pic;h@?s~Wu2`x@ttd|nL^K&+*-wY8-}qh`aPPfl37 z4be}to4rRSnH9cYNBuQR|#gmJwM|2y2x20V9BX`!9yOiyHA`7y9S~_jlvQ z%(!_o1j1tJ?Y$RhLL@oPbNxgi@AqyzV}dwE_oX~9@kfc}6*^O3EsS-FXU_0ECdb3` zD+|O}iFHXUDT5xWenODpN0~>HOgldzWYn(z>mvh8{gO*CIu8^#zzYR?p{+H;ULw6> zV@VI8;_SD5c0Va2pBhou1igJiVDlHHyb=AjL=gpqB>2aVA1Wc#lWvH#lU?5H>zy&Q zvLulAPt6_T*67_1`QZOCO7mo?zAM!F@2UogNFiyosxju7TJ!2qsS~OBpOW$R`F`MS=5V8SB@D?6Oe zigIeG+1Q(`kiJh1d5Khz718K*M#P^;=ou||d@&lHF+>X4l{TQCFxcoE=6wJaI3ZdP zSR~=R>c&V4ad9u)ygflg#qb413(*s#ZClxmGgAD02IV;wM8S{=(|3p!k-fmO zBWXWO(dT)`os&hwvOfZo7)gkObYJNa^L4*k?f;E{9KTbcZ0pg^`8P!g(t;viy%L}y z-lnfBhO(c^^0B!J(_OZmln&{(jNu;Q(&%-CK~D~hi7v+l-+QA$9S@;bUHAF54YOb~49J)w2C##Z|*-dd?$r*x;sVar5?-_~gMx_J~aLu}3UF#}o`9ZM8&R{}7&5V4ghN8wlkDzT!X zB7_%95>Ajnr(QWt?Fe|q1#08TtMP5Lw6_ajm+_Ykox|Qwm(iIHTL_WTI}1Uwrd1c# zfK#maW|^a1OK3oK1}0&SHtcz+&J^Bp0<7V(LI2j74+NW6vUPHYMHtHI8Q?(AT)^%v z)1niU6ybIR(ZH4HY zmQn$V4{~+H$?Il&UzP(oUIT?Rc$qoU!Os-2%bSojEmiBkJJdRhmE!@xElb~bGR-%h zCAz9u;B|*Zs|>JGCej2Hr<&Uf`NL&`hG;oUxm64K8NNm^*n{7(S3Q|Htd_C?$x%oM z`TYvqSroSyNkSf%1>!uj3H>-7oGcq6FYrQejv{0sZSofJKNw{maMeMEJLGAZ!KUB1 z89thww>WVVq4s68bJ@t!f=dv$rGl{WwiU`K)|D$xeLgWEl!96Q`o(M_`IbAqZmC+<4%$xFPVC3M&Om8( zJzs|`poE^HegC}vsT^Z|F^|_E*=OVpUPN287oxRa@|}3226pck@WmzN6TQCn_n>{XMaqDV?BIII zbRxErLtjv?bQ*JAvkdf9WBLi48k5pd5=;>VPz73r4HU4TjKKWCb zhun|FBqevR^3l%|&ZWRt8tOmnCxgTYZ&I(>HcCwlW&0M-+`6M@Jwn{2>vYPlaOOw^ zW2kerJJGmkYf>of%xuirb5Go=iRiUq^C-=zsA7tss&C+sqT<3Z>2|h%s`B}5T8$jb(QcqpTgyZ_%>3ZSRF^+_%`soY@$vMSZjR4N&s0%L_5R;fs@ro% z>__?s$FoPtJFDZn6O|wdE z9b=Qa*<}iHtVmJgbnmH;e5}oV#16b3lF@RovapYMl)fo4`i_1P*XAzyVRNzyMDBCG zk*OYfHoZGVG&eX#WRB459trzT>sPR&k9KCX_S)#@obV-|-#&(fuAY*GGy2<41 zSo&+MN|M&T8=tE_UZ3g;QffHvQjcbym{H~P`=K6ZlgM6G|n-Ni-HU$jTUBXjcMD85y@L%08i#Xf`2ZO{l znTtNB3d;C6P&MccG=F=@YKC2}`0p)~P8$7kd9ympupP@MAwl&WwPA>7brU3-ltzx8 z*1IUb3fgEn*V3*OcmKpZzNe7s8Q?su=H<&GqQXe+V9Dm<$9g22S)ej_Z5nylle3@@MyhW_+7CTn>DS7Ej z-uwsUjn_$5N(6P7LPFMW+YMSlX|c!SDk-<(GgT!p4AMS z<+}aw6Qmon7AiSDIYlBbTsb>KBzSFC zSBF~CfWylcl?c=SQCl_3zI&i^I}l{?Q_43irhFs%BLjIr&H?4IJ;99} zEGiVH>r07ruWZr;RfJ$xOzymrVg!CN?jX?2Fn}xPL?i0LL zx7{8(=uyPuFC4KlBzZ1>B38q(D7?@sb{Kj+ppqC-s`nn~TfU6TfJ(wqhx~Q?^Gfwf z%bxmAIKD%RhvMV@K`Aq`*cuGy=xciy9#5n51TvQmFWYd%U^g}t);p74lXodiw{EtB zkqbyc=gPn45`n5PUM3|~aN{9;3cra_BQeL=B=3>ArdY+LN z#3#Qs&}7rhgZo-q{O-4BjI3VbgBthlIb8gIHMha=;0oAkuv`atY3RAF{uN}314j?oTTu-y^0!158@>!w;vm%8aH`M5jS3qdCbJ(xAjA}s`Ct15 zZoUti4SNU?V}ZR3C3nrf-9WG*rsp*(Ay3zDQZ+aemch~v)NLG{Ngdt{Kxv@C*Hh+_NtqZy>Pu=Q+w^1 zg}-7~U#J#pCvb}Eb6BHYwF4YI82@r2$ANbia_N6MvwViMZ zvV+*kBg-n`xHTxPMGfulDx# zZd1liZZi_@cTa>&W2mw(LZIG^bBRcuVL?>bku0W6XBTpg=E#LIz;~V&Yo9t2kWo>j zPIHpYgfYi0(-7KmUZ^HHsbB7oE?JkSJ|0mj3WV}AeTKyA$j8*h@dZXtSZB9lbJyx5 z&5F1sET)U1D+L&kRXGk2>nJ@Xr5jb_e)Y12=T?P_zLN%sX~>z@7o{5h)X#e8jw~cF zHUZAyKfy!uRGBA}4La_r*rJV@1WFvShK~Jk6Dlmc4&h^k3@hbi*(ALhF+=f=Gr*1b zDr&lh-&=nu(mZ(H+X3nJvyF~8`rsSt`&VI}Hg{3>^MkC)Zf+|MPXn@ref?jM?seM# zwj*v1RyW9!NeC8v*pD1mI%9d)iE>mfP#yd1}a0N{KF-;%$+ATFRBkY?(d5(aMQN z%etp*&pT*zL?LeRdT=H3PP7t#8L3`}uj1ziL$VjUvo&lPcijGN*Qah5ClRDsam0+5 z>O?H7^M6G$jd$9v5cP=33=*#C*Am&7KOc_Gv*mQ7cS+dhxaQ;a*p^_$oR_fmB|PHw`W5iPrOkHmaUb|v~0YvrcX=(yPL*z86zOWxHd(YTIe0Ib?s*^ zj{v2)m#OJAfsWwgDPfglq`q}uYBh*p1KX6FkEF!@*09z>dcW30m@&2pyfV3{E=rLr zBq>>L|K(3CMwGGD;K_{#@10x=$=e8hT|^iKKYnxhMF)zD-NAC##b)-YK!2jC`+fX~ zPgh$SYfE7z2!1J@BWLs`+M-IWU+cB?im{cJBIQ$He`b&S)>3$`Q@SZlgo9Fr?6qcP zuf6+Luwu8}pG*PT*ZE^+bwhK3enTEKx^9Z5y>`@`05 z295$Za~S`DS4BX#__(ac-LRJN?cZHdGWB;oZmZ_(Vq_U>jhYRIzjmAjX`-E}$Xp&} zb&D+pe)amV7vu8LU? zhovvRrPR1Piz-gHuB@|V2?0e21%wcb$qFY>` z|D?dzD8r4ul8w%6A31+b$13bcAuKDr`F)}nk2JP$V%-o{YA}dlfb(tqcF?gRb%$@M~RRrkW{xaW9Z!0(RQp-bDtCkn4i6}7Gkl_wB6Qg5v5 z>s-N#GVipykyAE@@<=3FO?dy_=k24R@gitTqF(zCv$GSh+lruM6C|)D=ZM@E;XUj^ z>X`4#mZP|+7VUW$U7fVY=5p^~YZ~1eirQYmG6|AvCD??DuaG)8^shP(gX>y&Qx>+S zbo$uzI6WqvVoe8I-a3acVFz0cxtvcU1Y+-%#c^PR))x7k+FdW^1 z6feERB+uMn=3e}nJAB5Cpv>EK8FLRfXbO1Tnvt$(lL#_tD#{}PqOkjHcZB? zQ7stT1eL7%Zc*-=B(ph;$~Fk^NG{$j2nU6-@4O!suv)1+xBaD?FWIEVlJ@X*9Eua$ zVH7fEN)kiAso{@rGtdvmipe==I*Lr&Li-Z%wdWh;d<94P2rKZ+ z8&ds19Dy_rDh_iFt7xC^=RLbpWql^NO=#J7eUytIk2O-@7IT|>#UwrKR&Pot`=-`J z5uvyuU>~gTz2QHT_$qU3&qIe3YYu+9=-_K1w`oO1u2ZScv zOZ#yfOR!Yz9t}^E4R}f+-a@mNNj``mL&uN~Ph6Vjv1syKN8^@s_Hmn z950>wI9H&s3Wu)1y%Ojw*hgESZsmw!Z4F`c+btxo71)`>cCmA*aS{L}N5Vf;2RvP4 z3Sx#y-wAjs+*Zgm(u3=i&kAV5k>dgE{N0I8u5XFD1o(4SQ9p5@m4P5%-Dp6pDNz3* zJw5$4dCgis%`GYPc>xvNzLZH7xAo@r@fI`~KDr(U<#?<8!O^XDD5MDLSQ3I2j|jGg z?l9P-K-cFII5NK=KA+U-deO<nnyg8ewBAH5O={Jy z&xAl4NZsLKMt@yMlh`&#C(n(X$MTU^nzB@NdVE|<?wp(!BozDGKtdW5fy3{U921+xLvryyl+6FK~R9=d}sk zyD4$`(lR+t4zFo;7EDjXCOx{Z|E4hI<_Irg*sTKeWQVO_=}nwAzTHEqZ}(^y1o>4u zGOGK$^WF&&aMBv$@;6q;%g`3~>*F4Ud+WyjEL*T@48N=V5LZ6=#!_9$Wvs0QlmsKf z8mk`p*WJ_0dKkL*M{I76P0M}W<(miUC2q@xhfA09Ta3dFo=h>_0q2o>9KCE@NOZ4x z*Mb$#0=^2(>M|xhFq?vxuBl761e%B4vtO~H#6#u4t*4t`M^m*iJ9L{?yhY+Qy7rHC zCdwN}{g#TgqGrEq0TKJt-^NAUo*_Z4&wK7skmbv#>P&5kO?JgeZ+|ZEX>2L=%f? z$f%?51)2k(d;*-3Us>B448Cr+$qn0} zciQIr`CG1mz>GDh;}}~TC^?T4V*Kp(ba&*vc@31ZX4he3{+Qcrj95trFgOc!Y=?(r zUWRK_+Q6|M>fHt!$c$d8oB7YuP|dw@yu)fZZU0rOJo_ZN9%`7rk@Q4!XXgPs=}Y^+ zuRwRUWk?zKgv*u!W@d&xSJMO`En6B}_3*kqi(f4t8+XYMGZ+_cx#iOEjq|<~BfrlJ zEB$u)pnE+|hK;l2$4D&qP#uNn40)mZBpgY3K(sIQfj+-~S%8qSfhEyGB?p+Y*Mm*nMUNEO2U;0CH zW@NHvhy};)r8=rj?o+A>Yv*`n zjVW89Q;3>zf=R-|m$|qZs5F02CC>)1wXZ3@-XdNN;zyxGwZvu69qSQLV*}pLCoDK4&wGKfyNEt-4h#04jO%9W2xu>ZO#5*ksH^1Mq$;`-Lx0@`l zeRyR1hXd!}1iQv7mGc{jG2zh*?w9;a1Lp`U`OE&>4a1qU+;l{_9lR}c(Y>~dB|s)V?+;3^M!vL6PMFyrV`|eJHz%Le{x_yujuk+;OyM{- zW5LgxLtqjb8tujx5`Dp`WPVFjRMg<=_9=ns6pn4bLs|njixyrRY}VrQ5kU<#*p&Fp zjvYZWb|Qlx4{plAej&^-^PBnzCT44a+DyI;I?x^_2~wJ8OHDtXBJ}ag?A=Z$NxX5Z zcdN7mZpQ$i5^i{w#o$;6py=l#P|xjd3129s$rCMuO+B1`@aH0K94}7I;*Mh@ z;}czh_)^;?^Siy998~-UYaZkFz?Xx|=+1Joc+DUOQXd@B`xRZIKJ~SQ#PNK8aJotW zJ>>IymrEwomt|dDGZZW+<3BB@M=D`k^TsJ4ILTxWzp?q&>e~i`sgKuOKgm0dJtj?6 z5LSSo;3>9B+{~_!+Q?IN-7>~KS$1?NpfDu(@Yxl-XiH$H#W&Spb-dr~2v@9xh7`+& z)OSO1$Ryrvy7O@;MaObS10LfYQzOwdSPv^N56{X+A3S?s(`Y(4@!>hdW|?~k;wDL~ zMzt#Dzt61oQ6wq#)K0XAe^kABpbMMNdB@RcwB;1#n1j%ed6`#iAvLb6Pl94j*Yzw) z3D@u*!Os3LiLFQe({vKt@uC4{hQ4BJ~f{A@*9 zpzOw3Z(itvJ^;pF_zyZ|`SE5|6?)JZ;)ybDs#vwL%J2G#_FLu_!y;lzT!+_JUZ_#}JHG#QkCOPm9mn`sfqt3xe zOBD)Kk8?l&cxN$GO3jXNdKiv(|CAhGQq!VM>Deb1|3g4MVbkR^tJ*2JOQl<}%PYX} zrG}?NZ!8Sk-kg%F?3hH_IYtuW{F(d%5Wj3bfYm45eRJbpa&M~bVvRDd#>xRn^()@h&?so)6P%Mie7 zpr&QLGhE1J9MKash`fMiQq^xs?GCt4j2F&L13oPTS#{MT2yeV z)+^k~3$zOPrS2LvDQkdHC}rM(2x?}8gzJX%A7

*@J)kRGmkxaj;U0uin&yZC+8s zhSvA-*xjK{u111ytmvyV)5GI37T%CVP|Idb`^TB$cI#V2ci6poB+8iM`-fkB2WCXg zB!@X7`1=-`Qnma3=q2?yi?i*=*hNABcP42B zF_K`AxKt+;zheR!85t#6Tg=`!1~vu~o~}46f|y=~I$1`Rw71O%X$A-1xg!4O(joe$jHQ#zyXq{EF*od;rXD-$u&j6l*mvw zSBL3Z4Sw&%ku79Z&0Bjnpp!}7^b5*CjU@L7?p>|IU!@G`6FVU(5!9YD%5qNmGPOBsgbxhH&;QPukECwDklgG+OB#6npg`mE)#7 ztd>vu8Z~aylRsh7viY{2!X_1TIfnGgcApcN5-sdlsh#lEuzuY23yutQa{b+0-|+F3*i-oOi`F)#IM0FET^FF=xi`#D)aF!6a5f8|h4&5rE}KqtGzp@DvOPN-T78~D{y zybi>G_tvapVqFvW7x%Iiw;zK!>2-yNhm-z$03=!?i&dxq@x!r(yn!5jSAU`gl7rX> zl(^{4;jDMG+)|BR7ifst56CT-Mu0KJ_)k&SitzLqk=xxt$UydIa}^pF9Rn?bjxt5? zm;#}Qd@Ld;7S~s3U}sWb#;AbQhn9H#-%wn2E<1{#uKfC2V@dOUGz+sg75>P&Fgi%n zBt-=yqI2Y&tF4VuwOf(!fBe#Id_&kHsdqxQcso6)C_uiTsdGvagr3@)#;`P%L(HC) zgCCY3?fnyAlhcOQArosE|8n0}L&q^Q^MLd6{QSJB1tV^2#y((!W;mTM^HMOvb%0j9 zmn771k{qXl%BkBauv*u_R55?Ct2wbRwEvvP;mDAQXK$J2%y0~(iVZR|46K`<0LH** zq4uUp&P>05vJe=vj9sH0xB%eHr-TE*? zD;3F-r(N;mr=L!tjqKc;mr55}^jZeH!VudmR0HeVYJ51;^!CKe((VZltjlan&6<$} zJ$sUygI`P7lx4ABoU~~pB^1H2%S5-bPRu&#`cJnKIZz`lWmx4I|^E!S#x05nd z7Julq#LhKzTmb7ih%BVQS%TqN?>AkGKnJ~Z4N)pf$ds__*?2Z4WxK(Ck}^o>K1h z70YV|h!_QMNGYTZPIrXtu+nG0@=Bz4o|n_Wp_lS2H2AnD2Ky65$2qkivJ5SkZZoh(VQxg8eHQjuh&9! zs)?8UZL(<`X2~O0tHo1;qs2LMMD=0yc%!*sljQdw&S=5;=m6(~L-$ngih?d*uqVes zmfU{`KvGW+NQ0AW835#o?e&bBll$wN$m>}Z=KR|)&>MXKC<>%%)~DVCGOqvA)H{ob z0dTNV6KTbdO@x36pGqh+`aT^9sG@MZe_*}~^ugBl4{823&z4!v3>UCnCG0^sH8u87 z#02&n_#;yJNtuDU+nyMO43+pGFweQdZ`&Oj@7CfySm*|dfNTBw?Zms)S%w1-Bt7PF zTux4Z^jDdv-us@WrkvJ^2P?e>CW3n+z#X^|3M~8_0P9?jd-~7)fx5{TCNrX`*`^Kp z*({P^>bnUt|A5$Z0ucA1JAPYEE{dJpBdRB<@5qk(Kh9GbI8W?gxrDe0HWvpJcHB?h zGMV^lcNj7So3Oh$)PotH+fy8)mRfo(LH{W1xF`eX>}l67=8-Js551Z*^WrbwH?RjI z&H~U*<`yqVtwNq1IG&Kj-Uh1+4SFp%m%=)%ULE<1L^r5n(jnq}P&~m-@or z8gNoSSJb z){g)eprEJ_%y{}@dOLpOBBm_$aES4Fa?U9Z0P*8bew@4f&g^in8*p^m_y+FekJMDG z2@+ZV3j+GRg$6{yyDBSCXKZ9CECj2qxq1>kn3k0*9ygJU?m5tBf?77k@frDo4G* z*0NaN|5wc9H4b}?3TXHjl+NE&-ZX&KBA`2jT@`mfQBs{_UE{aFGiRd`=i36njiqEl z>0VAG!Ep{6ufU+G*>fPyEt{B)1Q9YbQ46MU9MQDh5`!$GazCa(%})*@!3!(9K^4X~J-YL!P)E zthV@%ix=OOlLUzhYCt-;P=pE?9Gj7HSP{wU6a{&U|HIQXrH~(v1ZmFqjC56yAZ39B zX;0PS1XtSCwG6;yM;G5J^Y-5-iKO-}IZcm35vhy$s5B$kW_wi2D)PSLRgk@1Z^E5N zYo!AHbCvh~n@XzRaUVqFLycjkrZW1HxIDL3F+6&!-vCK&)IZRl$t`4~(nK{h3P2KN)s6ZRr}pQ~PkgTV*aDQORb)WESc8zc;rT+rjK11X zAD@0_gJD1tkj1V|TJoaWs96we%oZ1LCYgKAJ3N0r6BT^ihdu)jRxoSHgX1c%pt`X= z?y4+@%TB{Gc=VPt^6aSCS&Km`^TY;Ewy070kzf-~<@e8F`XR?_{#5LUwdJ3pxFer* zrLE9o{v+y(O;Sql;zHd=YEDFgHShHlWDjKiaj&n^$Igk62et51l?lm z%wuI$hC-b_27*~qSR{DQqgxQE>iBZVye?Ldn)xntVeWr5qct+?k~KfXr>8&mmPp=e z?2XtKf4{SUFKq2KvU6=x)bs-E1Olc{W`-k?H8f>b)Lu&XY zL8`U0vXN)u2(&RQWTlQ1y7SM~qAy%zEYw>NczQ z9DUI=jWxU=swzc~u_1}OvEyceuefahW1~7eYp~X`Eb9yG(1LPMIZvw@M_UNIN29X% z2KAh@^w}kFYs*kyH&~l4Nm0bvoV-ca*rF5i=*0~m<7yQH-WgCO^Q~v9?wBkLA*GZy zki->8<$ZpXj=#9!Y0!QtIpMWMP#dGP+6m;Hg;5U^lGy)O);Aebr=jQm>}+gLb3Wl} zc~k;OCNi12D|?qpCY>^SFxk`s2B2UzcYO(8u~kpX=<20M-ZtugqY5%B4s)lW4=q|;uyII1EWPUhXAyBe_MqOiIVswj($c{R4(SZmj&CJ@ud#SNG=2Ht=(g7h z6pTabR?!)3B9dvu9mQK=>u^Ag4jk?N8$~^k^Si&bcC<^v#$7lbFnhdsh z25P#OKvl}{>#<2h{HNsM+;Hy#0;`pjM>M!x<;fIV_>(k_<$?dk8jM{DQu0QXaAhrH z&ialEd+Y+Wb8Z$N-hmf_8^kO61Bz}Bf|N2Sh8EYJs|h|lI$QT_kG*96hOn!fXn6Dm zH-X7y@vv+AILC4b^m&{&H%0hlXj#nfwE}1WIDr{dWDg$QzfneZWowU3VA6z;1HJfZ ztD3dMq^J7fE>IX~c(oNl1$&o-23JeDOdb1RJ26&+|K*f(5_?NC?NgJ86i0S?AxZ5>P?|1$sqdMCO7Cio`KG@seid zW&hc<0_x1mHI4{82^y2*qd@jh`+~Qn;fMDDs?+lC-@iY?@CoNG_C4e2@mzn z+tqFmR+o~t1d%pMnpmWL0YkVCtH?*@9|=qS_M3*!N{;y03|}ar-z2K=#eCZrWMzl@ zT08mERo-iu*fwN6IO=&5x6dzC_$}&ufFI|kr`4i{gwraNN^U-aO{ioS-63j!ZJw9i zweJF=Nqz9$t4KB(vBJNX6w-_$TU-v>)=?`isQIc6x6L6isk5MpvOGr8#mXI|sXy11 zFow-+CCrqZ-@E}@exFs|AAag)I99QKop~m>UJ^UPIWZ$#smpGpNct_mM#?}F^rLTs z#@M$zl#>#qQTDRWb_oqANdm`II{nNm#V>oBu4&dQtsH1Cqb|}#$6bg};9RNmK3lRI zv}8tEOa{sZlxz|uL#`^|WuFmKA#46apM@!Pm1d(-m?um^tWS=1oZr~312LV@f{bqA zWTzB87o=pW0yoTb|P| zQ>Bd;UarSC!sS9kTRJbYT&Pjg%G%FM%%0W@;dIrzSRoN=dCtjWI)!!H@DPkI{0ezO z2WBA#>&!@>I8+cU;y#!mdsOzhO}E-~q4g(Gd{m^r$xtimT6&fdeWhQ3;@yL%gN+k1 zuM{puNboqrMh|HFa6K>@_sMHza7Gt}zPw)tMPOnAz7LMs3`|mfsm^NqV<*bbx@kz0 zQsby5c=mX55~*~VPd8M~Dya1Q)yh%#xi0DLA`YqTir|TBXA(1Iy*_nS|wia<)^RUaEZYVvBvJy2w^n0VdTU7V% zC~t~nc(mHMuendWCy&MUdA`)YpDwq!`~973W?%o-73o+pWAeEpS)bsqD$300!=N#5 zq+rmE9d_L@?t@EAk_qU5xfZ78;pY&D_0k2zjtGWw^8z}6iE%IHTg4}T@sCJtc4JmT zNLudH?BO1z_ticb!I(^`1oUfN?CTH4H` zY>%%Rm9P;&y5Bjuej9(z_V@Vfpm3aa_N%BrE_!aHhgaOS0?bWN1`f00-_wK-WZeF#KsYia|GZ+wkT^Pq?R07dEPHOix33YMfyU0r+A zy9?lJ7J+3}pd<8({W;qvt?w8j#AuD4MnvkO)3`|mSRR;s8Z}z2rGZ-;34XwiLTXMM zhgD@f$dc}RM+~WL4u@NyMDzQ_3t~0DMOFDv2xhEBq|6!@HAJ&Y|0)4b$Y9KP7cQVo z{H5t4u8F1OyA=$DwDlUAEfGSDgQ`$=TVQf4tRo*xZei!UsB6|z+1%Vw>ezf98A1SA z6UX)qj>}XQ=}{)f4Dcg`y~fF2np+i<&LzSS$dNLNwI)N(m?~?4j2@5nH>7u zv~|t^e9>WCvUNog)M~ycJTW$-k*%2g3|ba&1Mqc&*NG`9e#WEpTg2$+e56~wLH_P* zL!ViP@8#-bN5JeM0ob9p^&gMC3Eh8Gk-DUJbapy`xwo1G2s&o95PYhJzVvtDJ_vZ39(zFo z{J?u{OhX$(e+C^Zn}1T`-ux%}YY_YV>E<*@8tijrA@XwPw##-xJ@;iQ<{eEn9k&jb z(H;ADDcpB^LpZ#p#UN=DUt}=5+;EwSQQfLRFwls5;e^OF?nj+~5$hf_n-@24WHdx&0aAl#z<+9U?mJrKp@M z64w+{MO~J&Atr>pyi>{FD%;6kWoX6(215yD#>`EkJ0~maDb7F`!V5gAde}SJy^_wO z^vb-df7G*kEn~BxTt$fdS?s{?lhF$F1o~H4eOD0$YZ}G})BedMTDoh7iU8sTW^ODa z3amO%r9+o>;YP-;R*r^_Jq2NcANEp+DIu*Jq;;TdI+4=Bo>Dy2q6QNf1u?Mo--56R zOpwkc2xq2mj{?RP(=FF*IHvZ^NuPi9PR#FeEJU+$|Kc>eMQR3Z0HreaMR5%mG%`Lc zpeVMV4AM&EtoafidzdJ*ne-@I$KK{ z<(%daUqz%6bL)r(4`zpeNDcuqhW3|dAhovd+;5OmN12pZyc z6y8q`u?{H6GryAvwB1fq{UGhVQ}OZ?D(>IorLRbD#TM_f_vtxvKYnaaN%pgL}40=4Q|z zD1i;t#Ei|7CwJTZnuJKCTf9be1$QrfT)>tTeE1j0qQRf6NA?uy$8|5|Gq`*#cEmxyD52*-0Xpjwp+T;ZAe`fg<2(R9R}Ask{oy~l zM!z`RNXnfKi~$>()eKpCQq(jxX9%k_SPO0MnQ6^+BqV{(u$JbFo9(_nNC;UkUe^-` zu4K%3sEC)G!$=pst%NHOAV+cceLT&dXmDHp@h>fQa_?GoTcZ7p1w~2>Sx2~{;`NH! z`vjUl<6s*0kuW>34aW(Hy)7H}Yo)AvJI^3o(GW~kfsuE*BkE~7^4 zIpqj#@9D^b`&(@uJiFot)>4?*^&ixr>60-ulm>Z*V$FYC&Xip}E0 zqp*G2eJ3q~WYG&J{}1QTmK5+R)Bsa!80b5jNTfIV;rrOu(GCK;QM0 z^C%_H4G2>GyEy&=q9B@I^IoRWq?Q@LfWiX8H23D$>oWM(P`E8Jscn zWwka^I0|{NkK!=KWm1uCZc+D!;g^>g&x8w17Zu0;M-dl?aT zO`=*>FGA^3^#9CMWN59St&3`KO_LpyloKF$AnX&}CJpN~fb-UsC#X@2&c2AH}5 zmKoZ{zn5_3sI4@)>=gc#s(;EjWb#itN>P@2mtx${i0V@HFW0)ke>cnyuR;z+kL;qJbN9QQ3k#SBCZpcHbKg1kuzvO$ z+`eq};l`iyaqbxP^@qCuyb6vf4ucKF3=V5=Z}R?R@z&I( zOomzcVOt+N^iPyPj3hwlHd2-1Gf$CTOX4MT=po$Uw@c~Xw<|y8%G#AuY<|4s+!fn` z9-pI1x(oma0V-6 zTXWua)cT;D{!h0EtoS-X1Go4hn^wF6G>z+8^nTeqIK~6bY+A2Jq-)2l*T;xu%_y%6 zx5W)w;+?8u@piTa$HiR%rXl#FwkLCj5th$BC0UK>T&4bL20j&91}m9a?v|JWeQ;;2 zi2gUw)L*C!qSiJ6Q7N{0qC{01E=2i9H*4%>zWr{b-MA4_^V?fKF_hD3?-v0h7n9%B z=h+@zIClQ>sFQJbnRMRwcfH;*s)3Uid575qm!ctR#a5dtgMT>BDGwcO?EJ-1JL76+ z#vG(&_ou}oLI*ck3Cae6(GIY+jY85)(?vW->MzrCN99cZjm zJ+eZIH%zR}<}RpqU!-}j#7 zX&ujKgMo~`Id+33W%|mT*lw)kEOK&2-k|BouY%3)Q-?kHU}?A{eU+L}A|C6u0tL-{!Ob_OhH{Oh_G>3Z{SWTk7UWXg#B*#GAB~ zQ>zJc64W{K0PrmzxH8ZYTV5#gj)jwT6EC}P#fJp8)_xMiwS7}q-XRh&4P02|YDvQ_ zXIhTR#0*azu365c#loy@t{R1rk8G6}0v?xHw+SSDWMjcN|N{z!Kn}lwpT=Wt-!F2ODB%mLjy2Icb0HO zc9>$lW?$MsjB!8YP2`~CN)f)jaEG0CgYun~o81$DpV(PM9OU9O`=qsr( zw92%qO!N=3fooqAV)`0M2p!gz;ZR-;VLEn%9+=NgaltN!57GN3ma^t3khj@;kVW?e zlkwujkv!8{FW$kYNL@e7i;89do9e7tQ5?H{Yvy=a)_?HI;G?*911_{^Ke}FC8V9!Ni|e*YQB?qtl~H+v6|{A%qN_E{vK~ zZx0ac8O0ta~E&LwL4>6_sv!=G3+J(u;7*(wtUZ1)d20* z!oIuvK1Jd(=cp`5G;z=4RX?;hfZKnnv)b{)qXS9FJ{I;nj?%x<%xW4A5*h*iHFBX) z4gY4-@-p>TGg$k9@d{=dwpT9CjIhiT-%SfW%bRu}$wqNp7C+ozmJMNU_4Ie~F>&~p z>BLM+Bzk4rePKIl;A&frBf$PK^hy&H6eLHnSVfvsAXjdYWZ#)-t3u@!f81L~ z3o%(AOfF(#3A!*83A4x2E)kI|UFj})HT{W=mzS4f3KA$C30>Q^&nbF$`ZYWI(|wSe z&4iDoY!~&lEASqX^O_HgCx2B?yA&*orKUky>3wAaYp zuY(QJwUK-dh)YN!EN-Pdnxsxbk`k!=#@Z%xK7JaAswK?@%Xxlh=WAdh7Lrr*dmNp5 zzk5KjP8b zBD&~teL>hrovO37hqCC1t}gd5$!*U}o|;!RvA+Gdc6k%(zj=UqsVKR8d|XoI-zGi% zn6{^6bRt!?n#@|Z$0^WoqayRpYY7k2S-1G3mDpyF3AFZpUn?MxzMKm%9>_Pw#Zk^6-8MnMeVsj4IaSZ}hV>k0T zL(11wo81CR6ozOSfCn>+)7^9;Pw8I;>;#j^X(5b2LsMdBZ9I2YX(5{&UC0YCI7Boq znyx*N*Zigk9tkyK-~q6n@!q*XB)N2$jI^|?N0P@HBOiFMq%ME0d0i@9IV*NMq6}uj z2_Rs09n7@fn`2pvs`67fZ!Of)UIrR8x@(6d+~NihHGw;Ua@RLy69B-Ccmhr?>d75O zE%m{qE4Nmxss05JeKIRNT^c$ZJ>^*^rb%f=j6wj`%m%%lY-&q)hmlOvx7prV)!RS` z5cBPeP+pPAU!}O%rWiO7r<#Akeid`^Z^?F8Bg-&mWSCy*d{Kg z$sKIU0u6SCddJ4-6c|DFLOIzPh?k#(uyLJ;5D2wB4y<7)uR=bcnc`@LJ!x^~+pZeJ73m zatZBCK%Clz;8Mt)ltyAznr{$CA}9eW$es}0cqKfso2HNDk-Zamdjxt%bL0w`jTj6-&Cu_$I;N;wf;Q9W#N}Z2yPS-Mpuniii0jECd2u+s-kl{I z2|EWFCkiahE6fITy+%O915B44wf6twr~zeq4F_UtN z5-lH40rH4vcb1;Z-+>2t1Yp!Enm^M5%d=4xg`QE|v1tK$+1WuB2EN@5v;a?Q)ubd5 z3g_6bn%XGV>56A?0A}B9gnjqgUG-g05MWfVHFbnD6k?`8nVJ2uNGjDkD~mjh8t{R_ zI(1U3M2`&nPe6Rck0{j(cYBNrsbhah7vF)P!)^_3P%wSx$4T9Fy_Z~TQJ5#SNP)=B z?YWOlj!Ao$o4+QB?6;R#r$D6HcS_InJsIfGSB1)iOz$!J0qpSdWkbhyej7Vb0()94 zWF``nDrUbUE2UmikQ|j(lr#8iU0b!1_y_>_w+^Ivd&{Pno(xpftCMsku56Zw0}WbL zVk6u7<3Ch%j0UBiv^gD%(NhBqA2x?vPhQDigCC}!UoAUM-{>}gxNV$_F6WLAu+KCt zC>ID>s-6_(0BHAQ2$gy(iS{cu;FzrJY*hQ~@pl?(fVN9reNdrWLmB5*$o{#WRkS1q zXqXpH_i?eXuyB;W0v~_9TIFZMFkB6R0EM?Vy2^-A|KXN5?QQ8|bxxZpsQ}-T^+a^_ z)W)gX4V)CAOqO#$yl^a#3ZS>e+*u+yaPYzDjTt6TE&V2_IdH`kiH;h|Gr?D%C2ODx z*lXequmHkzCWP!>**0#YGH~OH(*7cQ+nR_9Q22CYCD9gj9Ug8xD0S5K;Pmb53xM0| zaALutq3x6Fa4H?YX5^hEf`y7AB9#&g_2e7XkY$WXqY$Cpy@clN`a%Ot#B-ak@WH7} zGY7}`Y02I-Z>a!g|1!bR4r5^wyMRrFX{)DdMdKq{0PUR~yN0nZRfMGSQ>^Ie zUwVFUjxCE>G3J!w-xT6sMAzJ^yL0z(Ql@Os_RviOY6|vCXCKk{tERZNQjN?KFmh&l zoyV#SggnnT=k1d2?GlA|={tYACMXgEFnn~#H`jB44~Uh5W%Vg!fX5S}Wf3)^Vaaee zzS8YQ<4yR4y{+wPjDdKa-5fRIfk`s@!&M`k)XHiVOoBDWl~o&{ZK*QG=l0{$lC!~8 zb}78msF^lg2nZJ#{j5lk?(BlV$CpO(jP};jW1mjyGGhIvX+%ap83*OI;L<$BSQGhI ztLjDq=^H4I_KY#PHMlgIf>@Wg%m5AIIxI|blwCMa;M+{WJjC9S+qb-x9c%K+y*dL@ z)})GK-MO)HVeXkZzV#XwG2Dd^Cv&v8;Qph>t{ zq*V)Y7=6IHvUl73ZoX5zG8cA)dH&1tx-oxlEG{h-4f0LS zMG47lGKNDGZ6nc5m7p1lF1xD=KDP!#aigxj=03HfH<-m`T$ayt%O^~%Z^jBl8iS3U z_1dZjYX<8wFaA(G9?3}Bh3@3};L_d|*d+QQw~Q{G52`^8aOGp)*Bv( z{m{bJ3;^+RiJ@K!RrNs~Cq>rPb=5K%J!7X|(8E(>Q;Vcg?tMQ!ReVMF^NQD}fN2Li`V4h)C*8AzZUh#|hZ9n{`67^VbNT z)f^39>QB}&(D!+2I02Hyl*8Ve^w@A;4WNLLF6cL!lOPCLHveYx8J(7D{o))r7nP(yM#k1~vllRm`~!gtUmgr8(fh zU&bc8srL;eebZxw<7hu;*hEFpc%?H_(`;!ku}h_LUSyX ziiX?%HJ~=a&@Mq-+QI%=DKT)&$RK+1KyA9Qp2AS@zANu_!C7f}tuZKd zt3`0B_%{`&%&hieLVkig(CLEfrUj!DU}VdWEb*}RoA>g`n_r`n8GsbijUy$ZJ0*A6dy&J}gyFa}ZqR7! zR%?O*o~f#*m7S;}dmWd<_c`kTpYr={u!MGF9&b;Edn`A>1%)_|Q&T|Sn)g&nCN+g& zCXDgdl*~%ck15ZdmaUyP3L)DDUC6GF;CIskZf`!;)g69V>c2P%rny+0{Z@Un$B%3JsI|Kh1UtF511e38$o#pzi%V&$f zL&zJBj?s~4)f4*Su#0AAf<6kH>%(=$TLoJSVr}(DI>-BoKCNGCjV2TOOJ^P^ayrf8%D_JPY{UK`epVyC1OQ)fWsU#xA0Yz&2eAGs6#xJL diff --git a/packages/builder/assets/make.svg b/packages/builder/assets/make.svg new file mode 100644 index 0000000000..75c33cd0b5 --- /dev/null +++ b/packages/builder/assets/make.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte index 3a85c7ed56..7c9f31352f 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte @@ -94,7 +94,7 @@ /> - {idx.charAt(0).toUpperCase() + idx.slice(1)} + {action.stepTitle || idx.charAt(0).toUpperCase() + idx.slice(1)} diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js index 843445a3c2..c6f8d25640 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js @@ -1,11 +1,11 @@ import DiscordLogo from "assets/discord.svg" import ZapierLogo from "assets/zapier.png" -import IntegromatLogo from "assets/integromat.png" +import MakeLogo from "assets/make.svg" import SlackLogo from "assets/slack.svg" export const externalActions = { zapier: { name: "zapier", icon: ZapierLogo }, discord: { name: "discord", icon: DiscordLogo }, slack: { name: "slack", icon: SlackLogo }, - integromat: { name: "integromat", icon: IntegromatLogo }, + integromat: { name: "integromat", icon: MakeLogo }, } diff --git a/packages/server/src/automations/actions.ts b/packages/server/src/automations/actions.ts index 2a6b760725..94d41deabe 100644 --- a/packages/server/src/automations/actions.ts +++ b/packages/server/src/automations/actions.ts @@ -9,7 +9,7 @@ import * as serverLog from "./steps/serverLog" import * as discord from "./steps/discord" import * as slack from "./steps/slack" import * as zapier from "./steps/zapier" -import * as integromat from "./steps/integromat" +import * as make from "./steps/make" import * as filter from "./steps/filter" import * as delay from "./steps/delay" import * as queryRow from "./steps/queryRows" @@ -43,7 +43,7 @@ const ACTION_IMPLS: Record< discord: discord.run, slack: slack.run, zapier: zapier.run, - integromat: integromat.run, + integromat: make.run, } export const BUILTIN_ACTION_DEFINITIONS: Record = { @@ -63,7 +63,7 @@ export const BUILTIN_ACTION_DEFINITIONS: Record = discord: discord.definition, slack: slack.definition, zapier: zapier.definition, - integromat: integromat.definition, + integromat: make.definition, } // don't add the bash script/definitions unless in self host diff --git a/packages/server/src/automations/steps/integromat.ts b/packages/server/src/automations/steps/make.ts similarity index 93% rename from packages/server/src/automations/steps/integromat.ts rename to packages/server/src/automations/steps/make.ts index d7c78a6dd8..324193c2a4 100644 --- a/packages/server/src/automations/steps/integromat.ts +++ b/packages/server/src/automations/steps/make.ts @@ -9,10 +9,11 @@ import { } from "@budibase/types" export const definition: AutomationStepSchema = { - name: "Integromat Integration", - tagline: "Trigger an Integromat scenario", + name: "Make Integration", + stepTitle: "Make", + tagline: "Trigger a Make scenario", description: - "Performs a webhook call to Integromat and gets the response (if configured)", + "Performs a webhook call to Make and gets the response (if configured)", icon: "ri-shut-down-line", stepId: AutomationActionStepId.integromat, type: AutomationStepType.ACTION, diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts index aa600c6375..110a2c0642 100644 --- a/packages/types/src/documents/app/automation.ts +++ b/packages/types/src/documents/app/automation.ts @@ -104,6 +104,7 @@ interface InputOutputBlock { export interface AutomationStepSchema { name: string + stepTitle?: string tagline: string icon: string description: string From 0f8d74157cf9d5011465d43c88e1afcd4762e656 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 5 May 2023 11:50:53 +0000 Subject: [PATCH 238/521] v2.6.6 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 28218ad86c..ebac370ac8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.5", + "version": "2.6.6", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 1ba2a0cbb2..6373218402 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.5", + "version": "2.6.6", "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.6.5", + "@budibase/types": "^2.6.6", "@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 513b64fe1a..9b536c1183 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.6.5", + "version": "2.6.6", "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.6.5", - "@budibase/string-templates": "^2.6.5", + "@budibase/shared-core": "^2.6.6", + "@budibase/string-templates": "^2.6.6", "@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 7da9a8b2b7..442e6482b2 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.5", + "version": "2.6.6", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.5", - "@budibase/frontend-core": "^2.6.5", - "@budibase/shared-core": "^2.6.5", - "@budibase/string-templates": "^2.6.5", + "@budibase/bbui": "^2.6.6", + "@budibase/frontend-core": "^2.6.6", + "@budibase/shared-core": "^2.6.6", + "@budibase/string-templates": "^2.6.6", "@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 ce91f44ec5..ddf27a462e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.5", + "version": "2.6.6", "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.6.5", - "@budibase/string-templates": "^2.6.5", - "@budibase/types": "^2.6.5", + "@budibase/backend-core": "^2.6.6", + "@budibase/string-templates": "^2.6.6", + "@budibase/types": "^2.6.6", "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 9a092bcf39..515c05174b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.5", + "version": "2.6.6", "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.6.5", - "@budibase/frontend-core": "^2.6.5", - "@budibase/shared-core": "^2.6.5", - "@budibase/string-templates": "^2.6.5", - "@budibase/types": "^2.6.5", + "@budibase/bbui": "^2.6.6", + "@budibase/frontend-core": "^2.6.6", + "@budibase/shared-core": "^2.6.6", + "@budibase/string-templates": "^2.6.6", + "@budibase/types": "^2.6.6", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 45427c87ee..d6e7e13300 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.5", + "version": "2.6.6", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.6.5", - "@budibase/shared-core": "^2.6.5", + "@budibase/bbui": "^2.6.6", + "@budibase/shared-core": "^2.6.6", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 3a66811f86..85bc4e4ba2 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.5", + "version": "2.6.6", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 21f00563c2..ce78c3990b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.5", + "version": "2.6.6", "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.6.5", - "@budibase/client": "^2.6.5", + "@budibase/backend-core": "^2.6.6", + "@budibase/client": "^2.6.6", "@budibase/pro": "2.6.5", - "@budibase/shared-core": "^2.6.5", - "@budibase/string-templates": "^2.6.5", - "@budibase/types": "^2.6.5", + "@budibase/shared-core": "^2.6.6", + "@budibase/string-templates": "^2.6.6", + "@budibase/types": "^2.6.6", "@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 4ca3344cee..aba3c65793 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.5", + "version": "2.6.6", "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.6.5" + "@budibase/types": "^2.6.6" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b5d7f23a7d..b3deeae198 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.5", + "version": "2.6.6", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 10a6fe210f..39b5e834de 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.5", + "version": "2.6.6", "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 1d312a7d6d..ed7f8a87fd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.5", + "version": "2.6.6", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.6.5", + "@budibase/backend-core": "^2.6.6", "@budibase/pro": "2.6.5", - "@budibase/string-templates": "^2.6.5", - "@budibase/types": "^2.6.5", + "@budibase/string-templates": "^2.6.6", + "@budibase/types": "^2.6.6", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 83dabb6fc47911730e335648c6687171fdf5a200 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 5 May 2023 11:52:37 +0000 Subject: [PATCH 239/521] Update pro version to 2.6.6 --- 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 ce78c3990b..4456c99179 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.6.6", "@budibase/client": "^2.6.6", - "@budibase/pro": "2.6.5", + "@budibase/pro": "2.6.6", "@budibase/shared-core": "^2.6.6", "@budibase/string-templates": "^2.6.6", "@budibase/types": "^2.6.6", diff --git a/packages/worker/package.json b/packages/worker/package.json index ed7f8a87fd..d418a1e304 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.6", - "@budibase/pro": "2.6.5", + "@budibase/pro": "2.6.6", "@budibase/string-templates": "^2.6.6", "@budibase/types": "^2.6.6", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index d7853ffbd9..a0cd7741f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.4.tgz#b300b401a4615afc250550e9d84151da42ceebc8" - integrity sha512-M8IJDT/RhJuIglV+Nt+3yqtlP6fM+WHcqHQr1PxxkU/dntq4fEwWANLQjV+jsKTOuWd/ZLhngkotf0q/B3C8Fg== +"@budibase/pro@2.6.5": + version "2.6.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.5.tgz#93cababe9e5f846b85222c9b6b31138baeda76cb" + integrity sha512-NHpwFKwTVOQ9xloiidvNgYf41xKYm6TmqJgt8xSO4R7Wbo/lGE4agDFjuivabiaVrnTYHm98heu0t+MFP9uZBg== dependencies: - "@budibase/backend-core" "2.6.4" + "@budibase/backend-core" "2.6.5" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.4" + "@budibase/types" "2.6.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 09462974e192578921c924cb54c7c24b772421f2 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 13:23:14 +0100 Subject: [PATCH 240/521] Use semver --- .github/workflows/tag-prerelease.yml | 2 +- package.json | 1 + scripts/bumpVersion.js | 30 ++-------------------------- scripts/versionCommit.sh | 2 +- yarn.lock | 7 +++++++ 5 files changed, 12 insertions(+), 30 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 54ce6dd547..0ae1bf5adc 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -35,4 +35,4 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - ./scripts/versionCommit.sh alpha + ./scripts/versionCommit.sh prerelease diff --git a/package.json b/package.json index 4deb5a5bed..27f94ada0d 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "prettier-plugin-svelte": "^2.3.0", "rimraf": "^3.0.2", "rollup-plugin-replace": "^2.2.0", + "semver": "^7.5.0", "svelte": "^3.38.2", "typescript": "4.7.3" }, diff --git a/scripts/bumpVersion.js b/scripts/bumpVersion.js index 7f68b44fc6..19deb684da 100644 --- a/scripts/bumpVersion.js +++ b/scripts/bumpVersion.js @@ -1,4 +1,5 @@ const fs = require("fs") +const semver = require("semver") const filePath = "lerna.json" const versionBump = process.argv[2] || "patch" @@ -7,36 +8,9 @@ const versionBump = process.argv[2] || "patch" const fileData = fs.readFileSync(filePath) const lernaData = JSON.parse(fileData) -// Get current version and split into major, minor, patch, and alpha components const currentVersion = lernaData.version -const [versionWithoutPrerelease, alpha] = currentVersion.split("-") -const [major, minor, patch] = versionWithoutPrerelease.split(".").map(Number) -// Calculate new version based on specified version bump -let newVersion = currentVersion -switch (versionBump) { - case "major": - newVersion = `${major + 1}.0.0` - break - case "minor": - newVersion = `${major}.${minor + 1}.0` - break - case "patch": - newVersion = `${major}.${minor}.${patch + 1}` - break - case "alpha": - let newAlphaVersion = 0 - if (alpha) { - const [_, alphaVersion] = alpha.split(".") - newAlphaVersion = +alphaVersion + 1 - } - newVersion = `${versionWithoutPrerelease}-alpha.${newAlphaVersion}` - - break - default: - console.error(`Invalid version bump '${versionBump}' specified.`) - process.exit(1) -} +const newVersion = semver.inc(currentVersion, versionBump, "alpha") // Update lerna.json file with new version lernaData.version = newVersion diff --git a/scripts/versionCommit.sh b/scripts/versionCommit.sh index b7f08ec18f..10e7a9df71 100755 --- a/scripts/versionCommit.sh +++ b/scripts/versionCommit.sh @@ -2,7 +2,7 @@ if [ -z "$1" ] then - echo "Error: version number is required. Usage: $0 [major|minor|patch|alpha]" + echo "Error: version number is required. Usage: $0 [major|minor|patch|prerelease]" exit 1 fi diff --git a/yarn.lock b/yarn.lock index 0305f3f8d2..35f1cc1ef3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21718,6 +21718,13 @@ semver@^7.2.1, semver@^7.3.5: dependencies: lru-cache "^6.0.0" +semver@^7.5.0: + version "7.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" + integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== + dependencies: + lru-cache "^6.0.0" + semver@~2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52" From e4af6a802a4ef27ebb17a5d7757828bba317754e Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 13:27:22 +0100 Subject: [PATCH 241/521] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 67838e687d..79bc94b17b 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 67838e687df0a0cfa4c6d3d30cca11aa28689e7f +Subproject commit 79bc94b17baba885eb20e72f9abba3ac8b9c0eab From 0aeb06bb2b4da2eaaa97b24bab712eb05fad63d1 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 5 May 2023 13:39:59 +0100 Subject: [PATCH 242/521] Merge commit --- packages/server/src/api/controllers/table/index.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts index bc967a90f4..8e248d57ea 100644 --- a/packages/server/src/api/controllers/table/index.ts +++ b/packages/server/src/api/controllers/table/index.ts @@ -97,6 +97,9 @@ export async function bulkImport(ctx: UserCtx) { // right now we don't trigger anything for bulk import because it // can only be done in the builder, but in the future we may need to // think about events for bulk items + + //const resp = pickApi({ tableId }).save(ctx) + ctx.status = 200 ctx.body = { message: `Bulk rows created.` } } From b63f593b17fe4e6091169ec97dffee27759b648d Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 14:07:05 +0100 Subject: [PATCH 243/521] Remove tag input --- .github/workflows/release-develop.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 7f5002b5ee..e30236971e 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -6,11 +6,6 @@ on: tags: - v*-alpha.* workflow_dispatch: - inputs: - tags: - description: "Release tag" - required: true - type: boolean env: # Posthog token used by ui at build time From d1ad7551dc2251494259fbfa3584c535cf8df7a5 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 14:14:33 +0100 Subject: [PATCH 244/521] Build before pro test --- .github/workflows/budibase_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index f4e0ddbd87..55c4405e10 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -79,6 +79,7 @@ jobs: node-version: 14.x - run: yarn - run: yarn bootstrap + - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core - run: yarn test --scope=@budibase/pro integration-test: From 1ba5eda14905e1dcb9e587c4a72519e9690efaea Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 5 May 2023 14:42:21 +0100 Subject: [PATCH 245/521] Fix usage of custom locks --- packages/backend-core/src/redis/redlockImpl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend-core/src/redis/redlockImpl.ts b/packages/backend-core/src/redis/redlockImpl.ts index 4e9cd569ed..55b891ea84 100644 --- a/packages/backend-core/src/redis/redlockImpl.ts +++ b/packages/backend-core/src/redis/redlockImpl.ts @@ -85,7 +85,7 @@ export const doWithLock = async ( opts: LockOptions, task: () => Promise ): Promise> => { - const redlock = await getClient(opts.type) + const redlock = await getClient(opts.type, opts.customOptions) let lock try { // determine lock name From 0414856089ecc36a4305f1ec9f6fb682b25777b4 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 14:42:48 +0100 Subject: [PATCH 246/521] Install semver --- .github/workflows/tag-prerelease.yml | 1 + .github/workflows/tag-release.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 0ae1bf5adc..fa6920e587 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -25,6 +25,7 @@ jobs: run: | echo "Ref is not develop, you must run this job from develop." exit 1 + - run: npm i -g semver - uses: actions/checkout@v2 with: submodules: true diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index da53612bd9..7becdc46f2 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -35,6 +35,7 @@ jobs: run: | echo "Ref is not master, you must run this job from master." exit 1 + - run: npm i -g semver - uses: actions/checkout@v2 with: submodules: true From 07e7d83a52b68a95ca2cc33c4c37c382feff8839 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 14:46:40 +0100 Subject: [PATCH 247/521] Fix tagging --- .github/workflows/tag-prerelease.yml | 2 +- .github/workflows/tag-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index fa6920e587..38822820a8 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -25,7 +25,7 @@ jobs: run: | echo "Ref is not develop, you must run this job from develop." exit 1 - - run: npm i -g semver + - run: npm i semver - uses: actions/checkout@v2 with: submodules: true diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 7becdc46f2..f7fd8c95d6 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -35,7 +35,7 @@ jobs: run: | echo "Ref is not master, you must run this job from master." exit 1 - - run: npm i -g semver + - run: npm i semver - uses: actions/checkout@v2 with: submodules: true From 699774536a163315e9d36f4fc5f15f6fe0c57047 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 14:49:05 +0100 Subject: [PATCH 248/521] Install semver --- .github/workflows/tag-prerelease.yml | 2 +- .github/workflows/tag-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 38822820a8..ed382a36fc 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -25,7 +25,6 @@ jobs: run: | echo "Ref is not develop, you must run this job from develop." exit 1 - - run: npm i semver - uses: actions/checkout@v2 with: submodules: true @@ -34,6 +33,7 @@ jobs: - name: Tag prerelease run: | # setup the username and email. + npm i semver git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" ./scripts/versionCommit.sh prerelease diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index f7fd8c95d6..60df77e9c0 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -35,7 +35,6 @@ jobs: run: | echo "Ref is not master, you must run this job from master." exit 1 - - run: npm i semver - uses: actions/checkout@v2 with: submodules: true @@ -43,6 +42,7 @@ jobs: - name: Tag prerelease run: | + npm i semver # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" From b6699aed1b5c6523d58404aea25be9ab79ebf678 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 14:50:49 +0100 Subject: [PATCH 249/521] Install deps --- .github/workflows/tag-prerelease.yml | 2 +- .github/workflows/tag-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index ed382a36fc..e04ef3b17d 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -30,10 +30,10 @@ jobs: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + - run: yarn - name: Tag prerelease run: | # setup the username and email. - npm i semver git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" ./scripts/versionCommit.sh prerelease diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 60df77e9c0..1423791157 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -40,9 +40,9 @@ jobs: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + - run: yarn - name: Tag prerelease run: | - npm i semver # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" From c0250875106128dc7e2f615a19144201a3f7cf8d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 May 2023 13:53:37 +0000 Subject: [PATCH 250/521] Bump version to 2.5.10-alpha.4 --- lerna.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index f0ce7b92cb..2593e293da 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.10-alpha.3", + "version": "2.5.10-alpha.4", "npmClient": "yarn", "packages": [ "packages/backend-core", @@ -31,4 +31,4 @@ "loadEnvFiles": false } } -} +} \ No newline at end of file From 18a9745a736a48ee5c7234a463d4671a33275611 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 14:56:43 +0100 Subject: [PATCH 251/521] Fetch-depth 0 on release --- .github/workflows/release-develop.yml | 2 +- .github/workflows/release-master.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index e30236971e..fed90c1517 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -24,7 +24,7 @@ jobs: with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - fetch-depth: 1 + fetch-depth: 0 - name: Fail if tag is not develop run: | diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index 0eb1cbbba1..255401f317 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -4,9 +4,9 @@ concurrency: release on: push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+' + - "v[0-9]+.[0-9]+.[0-9]+" # Exclude all pre-releases - - '!v*[0-9]+.[0-9]+.[0-9]+-*' + - "!v*[0-9]+.[0-9]+.[0-9]+-*" workflow_dispatch: inputs: tags: @@ -29,7 +29,7 @@ jobs: with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - fetch-depth: 1 + fetch-depth: 0 - name: Fail if branch is not master if: github.ref != 'refs/heads/master' From 4ace415c02159b35ec5e282a5ecfe7ef8c9353b4 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 May 2023 14:00:20 +0000 Subject: [PATCH 252/521] Bump version to 2.5.10-alpha.5 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 2593e293da..b6c8d45fc7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.10-alpha.4", + "version": "2.5.10-alpha.5", "npmClient": "yarn", "packages": [ "packages/backend-core", From f31067d50ef2a5423a718a991530633982fec482 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 15:19:20 +0100 Subject: [PATCH 253/521] Don't boostrap on release --- .github/workflows/release-develop.yml | 1 - .github/workflows/release-master.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index fed90c1517..fc1a78aec2 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -49,7 +49,6 @@ jobs: yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" node scripts/syncLocalDependencies.js $version yarn - - run: yarn bootstrap - run: yarn build - run: yarn build:sdk diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index 255401f317..c0f6de3aac 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -54,7 +54,6 @@ jobs: yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" node scripts/syncLocalDependencies.js $version yarn - - run: yarn bootstrap - run: yarn lint - run: yarn build - run: yarn build:sdk From 0253406596272b3bdd58ef90dc89a15f53bda5bc Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 May 2023 14:22:15 +0000 Subject: [PATCH 254/521] Bump version to 2.5.10-alpha.6 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index b6c8d45fc7..ae6ea3cb08 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.10-alpha.5", + "version": "2.5.10-alpha.6", "npmClient": "yarn", "packages": [ "packages/backend-core", From 1de22e3758ff0ea98299ebd4d23398c89473fd23 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 5 May 2023 14:30:04 +0000 Subject: [PATCH 255/521] v2.6.7 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index ebac370ac8..85c77624b8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.6", + "version": "2.6.7", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 6373218402..4e186dd705 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.6", + "version": "2.6.7", "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.6.6", + "@budibase/types": "^2.6.7", "@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 9b536c1183..23a145e7c5 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.6.6", + "version": "2.6.7", "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.6.6", - "@budibase/string-templates": "^2.6.6", + "@budibase/shared-core": "^2.6.7", + "@budibase/string-templates": "^2.6.7", "@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 442e6482b2..b32d660471 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.6", + "version": "2.6.7", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.6", - "@budibase/frontend-core": "^2.6.6", - "@budibase/shared-core": "^2.6.6", - "@budibase/string-templates": "^2.6.6", + "@budibase/bbui": "^2.6.7", + "@budibase/frontend-core": "^2.6.7", + "@budibase/shared-core": "^2.6.7", + "@budibase/string-templates": "^2.6.7", "@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 ddf27a462e..c80530f716 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.6", + "version": "2.6.7", "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.6.6", - "@budibase/string-templates": "^2.6.6", - "@budibase/types": "^2.6.6", + "@budibase/backend-core": "^2.6.7", + "@budibase/string-templates": "^2.6.7", + "@budibase/types": "^2.6.7", "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 515c05174b..c4d3c1b13b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.6", + "version": "2.6.7", "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.6.6", - "@budibase/frontend-core": "^2.6.6", - "@budibase/shared-core": "^2.6.6", - "@budibase/string-templates": "^2.6.6", - "@budibase/types": "^2.6.6", + "@budibase/bbui": "^2.6.7", + "@budibase/frontend-core": "^2.6.7", + "@budibase/shared-core": "^2.6.7", + "@budibase/string-templates": "^2.6.7", + "@budibase/types": "^2.6.7", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index d6e7e13300..6d917cb863 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.6", + "version": "2.6.7", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.6.6", - "@budibase/shared-core": "^2.6.6", + "@budibase/bbui": "^2.6.7", + "@budibase/shared-core": "^2.6.7", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 85bc4e4ba2..3df72d79fb 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.6", + "version": "2.6.7", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 4456c99179..81892a8618 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.6", + "version": "2.6.7", "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.6.6", - "@budibase/client": "^2.6.6", + "@budibase/backend-core": "^2.6.7", + "@budibase/client": "^2.6.7", "@budibase/pro": "2.6.6", - "@budibase/shared-core": "^2.6.6", - "@budibase/string-templates": "^2.6.6", - "@budibase/types": "^2.6.6", + "@budibase/shared-core": "^2.6.7", + "@budibase/string-templates": "^2.6.7", + "@budibase/types": "^2.6.7", "@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 aba3c65793..e1e4a01f52 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.6", + "version": "2.6.7", "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.6.6" + "@budibase/types": "^2.6.7" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b3deeae198..a02d13b3b6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.6", + "version": "2.6.7", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 39b5e834de..a39114a76d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.6", + "version": "2.6.7", "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 d418a1e304..7254ec46ee 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.6", + "version": "2.6.7", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.6.6", + "@budibase/backend-core": "^2.6.7", "@budibase/pro": "2.6.6", - "@budibase/string-templates": "^2.6.6", - "@budibase/types": "^2.6.6", + "@budibase/string-templates": "^2.6.7", + "@budibase/types": "^2.6.7", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From c73f9eb12f8e7f8c12e3479d55cc238bbb61b4dc Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 5 May 2023 14:31:33 +0000 Subject: [PATCH 256/521] Update pro version to 2.6.7 --- 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 81892a8618..a8c04bf14e 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.6.7", "@budibase/client": "^2.6.7", - "@budibase/pro": "2.6.6", + "@budibase/pro": "2.6.7", "@budibase/shared-core": "^2.6.7", "@budibase/string-templates": "^2.6.7", "@budibase/types": "^2.6.7", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7254ec46ee..59e7f18d76 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.7", - "@budibase/pro": "2.6.6", + "@budibase/pro": "2.6.7", "@budibase/string-templates": "^2.6.7", "@budibase/types": "^2.6.7", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index a0cd7741f6..d293366bb3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.5": - version "2.6.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.5.tgz#93cababe9e5f846b85222c9b6b31138baeda76cb" - integrity sha512-NHpwFKwTVOQ9xloiidvNgYf41xKYm6TmqJgt8xSO4R7Wbo/lGE4agDFjuivabiaVrnTYHm98heu0t+MFP9uZBg== +"@budibase/pro@2.6.6": + version "2.6.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.6.tgz#337027168d17a44717c2648b3209a0e2daddcf7d" + integrity sha512-RldUn/WjN7eaYRxL4KBufK1yhVIycJOzoncD+BPgRKstuuuYzPultGZcpNsQQiJkAhNR6QXhG+ovvCUiA+AX6g== dependencies: - "@budibase/backend-core" "2.6.5" + "@budibase/backend-core" "2.6.6" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.5" + "@budibase/types" "2.6.6" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 4be7a4cf7791890b074ba677bddb7edc61528b51 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 15:33:50 +0100 Subject: [PATCH 257/521] Adding logs --- .github/workflows/release-develop.yml | 2 ++ .github/workflows/release-master.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index fc1a78aec2..9b84b70de0 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -47,7 +47,9 @@ jobs: | sed 's/[",]//g') echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" + echo "Updating dependencies" node scripts/syncLocalDependencies.js $version + echo "Syncing yarn workspace" yarn - run: yarn build - run: yarn build:sdk diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index c0f6de3aac..fdea9f76c2 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -52,7 +52,9 @@ jobs: | sed 's/[",]//g') echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" + echo "Updating dependencies" node scripts/syncLocalDependencies.js $version + echo "Syncing yarn workspace" yarn - run: yarn lint - run: yarn build From 9bfb7386a780c5540151ecdf3ba06c59f7990841 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 May 2023 14:37:01 +0000 Subject: [PATCH 258/521] Bump version to 2.5.10-alpha.7 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index ae6ea3cb08..5d7e993c0b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.10-alpha.6", + "version": "2.5.10-alpha.7", "npmClient": "yarn", "packages": [ "packages/backend-core", From c2a1cb5e0c575af65735f59c18291decef37731e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 May 2023 14:47:16 +0000 Subject: [PATCH 259/521] Bump version to 2.6.8-alpha.0 --- lerna.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index 25863c3991..d6a51558dd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.7", + "version": "2.6.8-alpha.0", "npmClient": "yarn", "packages": [ "packages/backend-core", @@ -31,4 +31,4 @@ "loadEnvFiles": false } } -} +} \ No newline at end of file From ce6c5bfa683ad1124ed513b7e4dca6c7982e812c Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 5 May 2023 15:47:55 +0100 Subject: [PATCH 260/521] Base connection work - extending the base integration to include the option of a connection check function. --- packages/server/src/integrations/airtable.ts | 10 ++++++++-- packages/server/src/integrations/arangodb.ts | 6 ++++++ packages/server/src/integrations/couchdb.ts | 6 ++++++ packages/server/src/integrations/dynamodb.ts | 2 ++ packages/server/src/integrations/elasticsearch.ts | 2 ++ packages/server/src/integrations/firebase.ts | 2 ++ packages/server/src/integrations/googlesheets.ts | 2 ++ .../server/src/integrations/microsoftSqlServer.ts | 2 ++ packages/server/src/integrations/mongodb.ts | 2 ++ packages/server/src/integrations/mysql.ts | 2 ++ packages/server/src/integrations/oracle.ts | 2 ++ packages/server/src/integrations/postgres.ts | 2 ++ packages/server/src/integrations/redis.ts | 11 +++++++++-- packages/server/src/integrations/s3.ts | 2 ++ packages/server/src/integrations/snowflake.ts | 8 +++++++- packages/types/src/sdk/datasources.ts | 10 ++++++++++ 16 files changed, 66 insertions(+), 5 deletions(-) diff --git a/packages/server/src/integrations/airtable.ts b/packages/server/src/integrations/airtable.ts index 1f56f0619b..58232ad56c 100644 --- a/packages/server/src/integrations/airtable.ts +++ b/packages/server/src/integrations/airtable.ts @@ -1,8 +1,9 @@ import { - Integration, + DatasourceFeature, DatasourceFieldType, - QueryType, + Integration, IntegrationBase, + QueryType, } from "@budibase/types" const Airtable = require("airtable") @@ -18,6 +19,7 @@ const SCHEMA: Integration = { "Airtable is a spreadsheet-database hybrid, with the features of a database but applied to a spreadsheet.", friendlyName: "Airtable", type: "Spreadsheet", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { apiKey: { type: DatasourceFieldType.PASSWORD, @@ -88,6 +90,10 @@ class AirtableIntegration implements IntegrationBase { this.client = new Airtable(config).base(config.base) } + async connection() { + return { connected: true } + } + async create(query: { table: any; json: any }) { const { table, json } = query diff --git a/packages/server/src/integrations/arangodb.ts b/packages/server/src/integrations/arangodb.ts index e28940f36e..3a61193577 100644 --- a/packages/server/src/integrations/arangodb.ts +++ b/packages/server/src/integrations/arangodb.ts @@ -3,6 +3,7 @@ import { DatasourceFieldType, QueryType, IntegrationBase, + DatasourceFeature, } from "@budibase/types" const { Database, aql } = require("arangojs") @@ -21,6 +22,7 @@ const SCHEMA: Integration = { type: "Non-relational", description: "ArangoDB is a scalable open-source multi-model database natively supporting graph, document and search. All supported data models & access patterns can be combined in queries allowing for maximal flexibility. ", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { url: { type: DatasourceFieldType.STRING, @@ -74,6 +76,10 @@ class ArangoDBIntegration implements IntegrationBase { this.client = new Database(newConfig) } + async connection() { + return { connected: true } + } + async read(query: { sql: any }) { try { const result = await this.client.query(query.sql) diff --git a/packages/server/src/integrations/couchdb.ts b/packages/server/src/integrations/couchdb.ts index 257b84ca13..dfb0daa2e8 100644 --- a/packages/server/src/integrations/couchdb.ts +++ b/packages/server/src/integrations/couchdb.ts @@ -1,4 +1,5 @@ import { + DatasourceFeature, DatasourceFieldType, Document, Integration, @@ -18,6 +19,7 @@ const SCHEMA: Integration = { type: "Non-relational", description: "Apache CouchDB is an open-source document-oriented NoSQL database, implemented in Erlang.", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { url: { type: DatasourceFieldType.STRING, @@ -69,6 +71,10 @@ class CouchDBIntegration implements IntegrationBase { this.client = dbCore.DatabaseWithConnection(config.database, config.url) } + async connection() { + return { connected: true } + } + async query( command: string, errorMsg: string, diff --git a/packages/server/src/integrations/dynamodb.ts b/packages/server/src/integrations/dynamodb.ts index 28c1c7b52b..c682f355f9 100644 --- a/packages/server/src/integrations/dynamodb.ts +++ b/packages/server/src/integrations/dynamodb.ts @@ -3,6 +3,7 @@ import { DatasourceFieldType, QueryType, IntegrationBase, + DatasourceFeature, } from "@budibase/types" import AWS from "aws-sdk" @@ -22,6 +23,7 @@ const SCHEMA: Integration = { "Amazon DynamoDB is a key-value and document database that delivers single-digit millisecond performance at any scale.", friendlyName: "DynamoDB", type: "Non-relational", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { region: { type: DatasourceFieldType.STRING, diff --git a/packages/server/src/integrations/elasticsearch.ts b/packages/server/src/integrations/elasticsearch.ts index aeba628d30..475ddc0bd1 100644 --- a/packages/server/src/integrations/elasticsearch.ts +++ b/packages/server/src/integrations/elasticsearch.ts @@ -3,6 +3,7 @@ import { DatasourceFieldType, QueryType, IntegrationBase, + DatasourceFeature, } from "@budibase/types" import { Client, ClientOptions } from "@elastic/elasticsearch" @@ -20,6 +21,7 @@ const SCHEMA: Integration = { "Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.", friendlyName: "ElasticSearch", type: "Non-relational", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { url: { type: DatasourceFieldType.STRING, diff --git a/packages/server/src/integrations/firebase.ts b/packages/server/src/integrations/firebase.ts index a82b3be782..0646c98eba 100644 --- a/packages/server/src/integrations/firebase.ts +++ b/packages/server/src/integrations/firebase.ts @@ -3,6 +3,7 @@ import { Integration, QueryType, IntegrationBase, + DatasourceFeature, } from "@budibase/types" import { Firestore, WhereFilterOp } from "@google-cloud/firestore" @@ -18,6 +19,7 @@ const SCHEMA: Integration = { type: "Non-relational", description: "Cloud Firestore is a flexible, scalable database for mobile, web, and server development from Firebase and Google Cloud.", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { email: { type: DatasourceFieldType.STRING, diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index 476a6511e9..8884c8de13 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -1,4 +1,5 @@ import { + DatasourceFeature, DatasourceFieldType, DatasourcePlus, FieldType, @@ -64,6 +65,7 @@ const SCHEMA: Integration = { "Create and collaborate on online spreadsheets in real-time and from any device. ", friendlyName: "Google Sheets", type: "Spreadsheet", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { spreadsheetId: { display: "Google Sheet URL", diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts index eb87c1ccf1..b6f360ce32 100644 --- a/packages/server/src/integrations/microsoftSqlServer.ts +++ b/packages/server/src/integrations/microsoftSqlServer.ts @@ -8,6 +8,7 @@ import { QueryType, SqlQuery, DatasourcePlus, + DatasourceFeature, } from "@budibase/types" import { getSqlQuery, @@ -39,6 +40,7 @@ const SCHEMA: Integration = { "Microsoft SQL Server is a relational database management system developed by Microsoft. ", friendlyName: "MS SQL Server", type: "Relational", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { user: { type: DatasourceFieldType.STRING, diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index 38b3891fe4..20ba2acada 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -3,6 +3,7 @@ import { DatasourceFieldType, QueryType, IntegrationBase, + DatasourceFeature, } from "@budibase/types" import { MongoClient, @@ -38,6 +39,7 @@ const getSchema = () => { type: "Non-relational", description: "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era.", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { connectionString: { type: DatasourceFieldType.STRING, diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts index 8d984ed402..6083223042 100644 --- a/packages/server/src/integrations/mysql.ts +++ b/packages/server/src/integrations/mysql.ts @@ -7,6 +7,7 @@ import { Table, TableSchema, DatasourcePlus, + DatasourceFeature, } from "@budibase/types" import { getSqlQuery, @@ -41,6 +42,7 @@ const SCHEMA: Integration = { type: "Relational", description: "MySQL Database Service is a fully managed database service to deploy cloud-native applications. ", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { host: { type: DatasourceFieldType.STRING, diff --git a/packages/server/src/integrations/oracle.ts b/packages/server/src/integrations/oracle.ts index 65e0829905..bbe2189bdc 100644 --- a/packages/server/src/integrations/oracle.ts +++ b/packages/server/src/integrations/oracle.ts @@ -7,6 +7,7 @@ import { SqlQuery, Table, DatasourcePlus, + DatasourceFeature, } from "@budibase/types" import { buildExternalTableId, @@ -53,6 +54,7 @@ const SCHEMA: Integration = { type: "Relational", description: "Oracle Database is an object-relational database management system developed by Oracle Corporation", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { host: { type: DatasourceFieldType.STRING, diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts index c981c3acc5..a968b71064 100644 --- a/packages/server/src/integrations/postgres.ts +++ b/packages/server/src/integrations/postgres.ts @@ -6,6 +6,7 @@ import { SqlQuery, Table, DatasourcePlus, + DatasourceFeature, } from "@budibase/types" import { getSqlQuery, @@ -50,6 +51,7 @@ const SCHEMA: Integration = { type: "Relational", description: "PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance.", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { host: { type: DatasourceFieldType.STRING, diff --git a/packages/server/src/integrations/redis.ts b/packages/server/src/integrations/redis.ts index 73ef2bb55c..f596b6eb0d 100644 --- a/packages/server/src/integrations/redis.ts +++ b/packages/server/src/integrations/redis.ts @@ -1,4 +1,9 @@ -import { DatasourceFieldType, Integration, QueryType } from "@budibase/types" +import { + DatasourceFeature, + DatasourceFieldType, + Integration, + QueryType, +} from "@budibase/types" import Redis from "ioredis" interface RedisConfig { @@ -11,9 +16,11 @@ interface RedisConfig { const SCHEMA: Integration = { docs: "https://redis.io/docs/", - description: "", + description: + "Redis is a caching tool, providing powerful key-value store capabilities.", friendlyName: "Redis", type: "Non-relational", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { host: { type: "string", diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index ad3bb09109..cc368760f8 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -3,6 +3,7 @@ import { QueryType, IntegrationBase, DatasourceFieldType, + DatasourceFeature, } from "@budibase/types" const AWS = require("aws-sdk") @@ -22,6 +23,7 @@ const SCHEMA: Integration = { "Amazon Simple Storage Service (Amazon S3) is an object storage service that offers industry-leading scalability, data availability, security, and performance.", friendlyName: "Amazon S3", type: "Object store", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { region: { type: "string", diff --git a/packages/server/src/integrations/snowflake.ts b/packages/server/src/integrations/snowflake.ts index db702520f9..877405d447 100644 --- a/packages/server/src/integrations/snowflake.ts +++ b/packages/server/src/integrations/snowflake.ts @@ -1,4 +1,9 @@ -import { Integration, QueryType, SqlQuery } from "@budibase/types" +import { + DatasourceFeature, + Integration, + QueryType, + SqlQuery, +} from "@budibase/types" import { Snowflake } from "snowflake-promise" interface SnowflakeConfig { @@ -16,6 +21,7 @@ const SCHEMA: Integration = { "Snowflake is a solution for data warehousing, data lakes, data engineering, data science, data application development, and securely sharing and consuming shared data.", friendlyName: "Snowflake", type: "Relational", + features: [DatasourceFeature.CONNECTION_CHECKING], datasource: { account: { type: "string", diff --git a/packages/types/src/sdk/datasources.ts b/packages/types/src/sdk/datasources.ts index 605b431d9e..ccd6f7b9c6 100644 --- a/packages/types/src/sdk/datasources.ts +++ b/packages/types/src/sdk/datasources.ts @@ -74,6 +74,10 @@ export enum FilterType { ONE_OF = "oneOf", } +export enum DatasourceFeature { + CONNECTION_CHECKING = "connection", +} + export interface StepDefinition { key: string template: string @@ -112,6 +116,7 @@ export interface Integration { docs: string plus?: boolean auth?: { type: string } + features?: DatasourceFeature[] relationships?: boolean description: string friendlyName: string @@ -124,11 +129,16 @@ export interface Integration { extra?: ExtraQueryConfig } +export interface ConnectionInformation { + connected: boolean +} + export interface IntegrationBase { create?(query: any): Promise read?(query: any): Promise update?(query: any): Promise delete?(query: any): Promise + connection?(): Promise } export interface DatasourcePlus extends IntegrationBase { From 67bd995aad3381daa0568c8c6efc143aa6b33444 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 15:55:16 +0100 Subject: [PATCH 261/521] Fix pro versioning on release --- scripts/syncProPackage.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/syncProPackage.js b/scripts/syncProPackage.js index 236586fdf2..833d14299b 100755 --- a/scripts/syncProPackage.js +++ b/scripts/syncProPackage.js @@ -26,6 +26,11 @@ Object.keys(data).forEach(workspace => { // Loop through each dependency and update its version in package.json const packageJsonPath = path.join(data[workspace].location, "package.json") const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8")) + if (packageJson.version !== "0.0.1") { + // Don't change if we are not using local versions + return + } + let hasChanges = false if (packageJson.dependencies["@budibase/pro"]) { From c597c0478764a8f9e7f67b651ce5b83528c03408 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 May 2023 14:58:23 +0000 Subject: [PATCH 262/521] Bump version to 2.6.8-alpha.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index d6a51558dd..409bbc2028 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.8-alpha.0", + "version": "2.6.8-alpha.1", "npmClient": "yarn", "packages": [ "packages/backend-core", From 735f3254dee3048f2b139263e623b1c09dd4a49d Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 16:24:00 +0100 Subject: [PATCH 263/521] Rename pipeline --- .github/workflows/tag-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 1423791157..55549a7e9d 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -1,4 +1,4 @@ -name: Tag prerelease +name: Tag release concurrency: release-prerelease on: From e74462a6875da99f7c9c8681d61cd03a8a33ba29 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 May 2023 15:27:18 +0000 Subject: [PATCH 264/521] Bump version to 2.6.8-alpha.2 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 409bbc2028..e25c4d44fc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.8-alpha.1", + "version": "2.6.8-alpha.2", "npmClient": "yarn", "packages": [ "packages/backend-core", From 4eaa95fc415692453e87073b2830ff64ecc9af81 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 4 May 2023 11:58:23 +0100 Subject: [PATCH 265/521] Type contexts --- .../src/api/controllers/global/users.ts | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index d9ebc87517..33335379c0 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -69,9 +69,11 @@ const bulkCreate = async (users: User[], groupIds: string[]) => { return await userSdk.bulkCreate(users, groupIds) } -export const bulkUpdate = async (ctx: any) => { +export const bulkUpdate = async ( + ctx: Ctx +) => { const currentUserId = ctx.user._id - const input = ctx.request.body as BulkUserRequest + const input = ctx.request.body let created, deleted try { if (input.create) { @@ -83,7 +85,7 @@ export const bulkUpdate = async (ctx: any) => { } catch (err: any) { ctx.throw(err.status || 400, err?.message || err) } - ctx.body = { created, deleted } as BulkUserResponse + ctx.body = { created, deleted } } const parseBooleanParam = (param: any) => { @@ -184,15 +186,15 @@ export const destroy = async (ctx: any) => { } } -export const getAppUsers = async (ctx: any) => { - const body = ctx.request.body as SearchUsersRequest +export const getAppUsers = async (ctx: Ctx) => { + const body = ctx.request.body const users = await userSdk.getUsersByAppAccess(body?.appId) ctx.body = { data: users } } -export const search = async (ctx: any) => { - const body = ctx.request.body as SearchUsersRequest +export const search = async (ctx: Ctx) => { + const body = ctx.request.body if (body.paginated === false) { await getAppUsers(ctx) @@ -238,8 +240,8 @@ export const tenantUserLookup = async (ctx: any) => { /* Encapsulate the app user onboarding flows here. */ -export const onboardUsers = async (ctx: any) => { - const request = ctx.request.body as InviteUsersRequest | BulkUserRequest +export const onboardUsers = async (ctx: Ctx) => { + const request = ctx.request.body const isBulkCreate = "create" in request const emailConfigured = await isEmailConfigured() @@ -255,7 +257,7 @@ export const onboardUsers = async (ctx: any) => { } else if (emailConfigured) { onboardingResponse = await inviteMultiple(ctx) } else if (!emailConfigured) { - const inviteRequest = ctx.request.body as InviteUsersRequest + const inviteRequest = ctx.request.body let createdPasswords: any = {} @@ -295,10 +297,10 @@ export const onboardUsers = async (ctx: any) => { } } -export const invite = async (ctx: any) => { - const request = ctx.request.body as InviteUserRequest +export const invite = async (ctx: Ctx) => { + const request = ctx.request.body - let multiRequest = [request] as InviteUsersRequest + let multiRequest = [request] const response = await userSdk.invite(multiRequest) // explicitly throw for single user invite @@ -318,8 +320,8 @@ export const invite = async (ctx: any) => { } } -export const inviteMultiple = async (ctx: any) => { - const request = ctx.request.body as InviteUsersRequest +export const inviteMultiple = async (ctx: Ctx) => { + const request = ctx.request.body ctx.body = await userSdk.invite(request) } @@ -424,7 +426,6 @@ export const inviteAccept = async ( if (err.code === ErrorCode.USAGE_LIMIT_EXCEEDED) { // explicitly re-throw limit exceeded errors ctx.throw(400, err) - return } console.warn("Error inviting user", err) ctx.throw(400, "Unable to create new user, invitation invalid.") From bbd06905189d6f00ab66d691bac5edbcd5f4e6c8 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 4 May 2023 12:35:58 +0100 Subject: [PATCH 266/521] Type response --- packages/builder/src/stores/portal/groups.js | 2 +- packages/types/src/documents/global/userGroup.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/stores/portal/groups.js b/packages/builder/src/stores/portal/groups.js index eda3961e2b..c7a54c7e6d 100644 --- a/packages/builder/src/stores/portal/groups.js +++ b/packages/builder/src/stores/portal/groups.js @@ -28,7 +28,7 @@ export function createGroupsStore() { // on the backend anyway if (get(licensing).groupsEnabled) { const groups = await API.getGroups() - store.set(groups) + store.set(groups.data) } }, diff --git a/packages/types/src/documents/global/userGroup.ts b/packages/types/src/documents/global/userGroup.ts index fedd8426f0..fa48c1636e 100644 --- a/packages/types/src/documents/global/userGroup.ts +++ b/packages/types/src/documents/global/userGroup.ts @@ -21,3 +21,8 @@ export interface GroupUser { export interface UserGroupRoles { [key: string]: string } + +export interface SearchGroupRequest {} +export interface SearchGroupResponse { + data: UserGroup[] +} From 10fcca92f65fbf61b395e928a445fa7de69d9223 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 4 May 2023 17:38:04 +0100 Subject: [PATCH 267/521] Paginate users on group views --- .../portal/users/groups/[groupId].svelte | 52 +++++++++---------- packages/frontend-core/src/api/groups.js | 14 +++++ .../frontend-core/src/fetch/GroupUserFetch.js | 50 ++++++++++++++++++ packages/frontend-core/src/fetch/fetchData.js | 2 + .../types/src/documents/global/userGroup.ts | 8 +++ packages/types/src/sdk/db.ts | 1 + 6 files changed, 101 insertions(+), 26 deletions(-) create mode 100644 packages/frontend-core/src/fetch/GroupUserFetch.js 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 1be019b83e..ccd945fc24 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -11,9 +11,11 @@ ActionMenu, MenuItem, Modal, + Pagination, } from "@budibase/bbui" + import { fetchData } from "@budibase/frontend-core" + import { API } from "api" import UserGroupPicker from "components/settings/UserGroupPicker.svelte" - import { createPaginationStore } from "helpers/pagination" import { users, apps, groups, auth, features } from "stores/portal" import { onMount, setContext } from "svelte" import { roles } from "stores/backend" @@ -28,6 +30,18 @@ export let groupId + const fetchUsers = fetchData({ + API, + datasource: { + type: "groupUser", + }, + options: { + query: { + groupId, + }, + }, + }) + $: userSchema = { email: { width: "1fr", @@ -70,17 +84,12 @@ let popoverAnchor let popover let searchTerm = "" - let prevSearch = undefined - let pageInfo = createPaginationStore() let loaded = false let editModal, deleteModal $: scimEnabled = $features.isScimEnabled $: readonly = !$auth.isAdmin || scimEnabled - $: page = $pageInfo.page - $: fetchUsers(page, searchTerm) $: group = $groups.find(x => x._id === groupId) - $: filtered = $users.data $: groupApps = $apps .filter(app => groups.actions @@ -97,25 +106,6 @@ } } - async function fetchUsers(page, search) { - if ($pageInfo.loading) { - return - } - // need to remove the page if they've started searching - if (search && !prevSearch) { - pageInfo.reset() - page = undefined - } - prevSearch = search - try { - pageInfo.loading() - await users.search({ page, email: search }) - pageInfo.fetched($users.hasNextPage, $users.nextPage) - } catch (error) { - notifications.error("Error getting user list") - } - } - async function deleteGroup() { try { await groups.actions.delete(group) @@ -211,7 +201,7 @@

This user group doesn't have any users
+ + diff --git a/packages/frontend-core/src/api/groups.js b/packages/frontend-core/src/api/groups.js index c27f11e0ea..cbc5bfd72a 100644 --- a/packages/frontend-core/src/api/groups.js +++ b/packages/frontend-core/src/api/groups.js @@ -52,6 +52,20 @@ export const buildGroupsEndpoints = API => { }) }, + /** + * Gets a group users by the group id + */ + getGroupUsers: async ({ id, bookmark }) => { + let url = `/api/global/groups/${id}/users?` + if (bookmark) { + url += `bookmark=${bookmark}` + } + + return await API.get({ + url, + }) + }, + /** * Adds users to a group * @param groupId The group to update diff --git a/packages/frontend-core/src/fetch/GroupUserFetch.js b/packages/frontend-core/src/fetch/GroupUserFetch.js new file mode 100644 index 0000000000..b0ca9a5388 --- /dev/null +++ b/packages/frontend-core/src/fetch/GroupUserFetch.js @@ -0,0 +1,50 @@ +import { get } from "svelte/store" +import DataFetch from "./DataFetch.js" +import { TableNames } from "../constants" + +export default class GroupUserFetch extends DataFetch { + constructor(opts) { + super({ + ...opts, + datasource: { + tableId: TableNames.USERS, + }, + }) + } + + determineFeatureFlags() { + return { + supportsSearch: true, + supportsSort: false, + supportsPagination: true, + } + } + + async getDefinition() { + return { + schema: {}, + } + } + + async getData() { + const { query, cursor } = get(this.store) + try { + const res = await this.API.getGroupUsers({ + id: query.groupId, + bookmark: cursor, + }) + + return { + rows: res?.users || [], + hasNextPage: res?.hasNextPage || false, + cursor: res?.bookmark || null, + } + } catch (error) { + return { + rows: [], + hasNextPage: false, + error, + } + } + } +} diff --git a/packages/frontend-core/src/fetch/fetchData.js b/packages/frontend-core/src/fetch/fetchData.js index 4974816496..c4968eabc0 100644 --- a/packages/frontend-core/src/fetch/fetchData.js +++ b/packages/frontend-core/src/fetch/fetchData.js @@ -6,6 +6,7 @@ import NestedProviderFetch from "./NestedProviderFetch.js" import FieldFetch from "./FieldFetch.js" import JSONArrayFetch from "./JSONArrayFetch.js" import UserFetch from "./UserFetch.js" +import GroupUserFetch from "./GroupUserFetch.js" const DataFetchMap = { table: TableFetch, @@ -13,6 +14,7 @@ const DataFetchMap = { query: QueryFetch, link: RelationshipFetch, user: UserFetch, + groupUser: GroupUserFetch, // Client specific datasource types provider: NestedProviderFetch, diff --git a/packages/types/src/documents/global/userGroup.ts b/packages/types/src/documents/global/userGroup.ts index fa48c1636e..b74e59c020 100644 --- a/packages/types/src/documents/global/userGroup.ts +++ b/packages/types/src/documents/global/userGroup.ts @@ -1,3 +1,4 @@ +import { PaginationResponse } from "../../api" import { Document } from "../document" export interface UserGroup extends Document { @@ -26,3 +27,10 @@ export interface SearchGroupRequest {} export interface SearchGroupResponse { data: UserGroup[] } + +export interface SearchUserGroupResponse extends PaginationResponse { + users: { + _id: any + email: any + }[] +} diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts index 2cccd3be6a..58b3b7e5bc 100644 --- a/packages/types/src/sdk/db.ts +++ b/packages/types/src/sdk/db.ts @@ -65,6 +65,7 @@ export type DatabaseQueryOpts = { key?: string keys?: string[] group?: boolean + startkey_docid?: string } export const isDocument = (doc: any): doc is Document => { From 8102c54bc30da8182de5fe94e7ef30962dc538b3 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 09:36:18 +0100 Subject: [PATCH 268/521] Add searching for users back --- .../portal/users/groups/[groupId].svelte | 47 ++++++++++++++++--- 1 file changed, 40 insertions(+), 7 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 ccd945fc24..6e5f337314 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -16,6 +16,7 @@ import { fetchData } from "@budibase/frontend-core" import { API } from "api" import UserGroupPicker from "components/settings/UserGroupPicker.svelte" + import { createPaginationStore } from "helpers/pagination" import { users, apps, groups, auth, features } from "stores/portal" import { onMount, setContext } from "svelte" import { roles } from "stores/backend" @@ -30,7 +31,7 @@ export let groupId - const fetchUsers = fetchData({ + const fetchGroupUsers = fetchData({ API, datasource: { type: "groupUser", @@ -84,12 +85,17 @@ let popoverAnchor let popover let searchTerm = "" + let prevSearch = undefined + let pageInfo = createPaginationStore() let loaded = false let editModal, deleteModal $: scimEnabled = $features.isScimEnabled $: readonly = !$auth.isAdmin || scimEnabled + $: page = $pageInfo.page + $: fetchUsers(page, searchTerm) $: group = $groups.find(x => x._id === groupId) + $: filtered = $users.data $: groupApps = $apps .filter(app => groups.actions @@ -106,6 +112,25 @@ } } + async function fetchUsers(page, search) { + if ($pageInfo.loading) { + return + } + // need to remove the page if they've started searching + if (search && !prevSearch) { + pageInfo.reset() + page = undefined + } + prevSearch = search + try { + pageInfo.loading() + await users.search({ page, email: search }) + pageInfo.fetched($users.hasNextPage, $users.nextPage) + } catch (error) { + notifications.error("Error getting user list") + } + } + async function deleteGroup() { try { await groups.actions.delete(group) @@ -201,7 +226,7 @@ From 2c49232fa85f9de8a47eb167d7a0230ec10fd14b Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 09:37:26 +0100 Subject: [PATCH 269/521] Renames --- .../builder/portal/users/groups/[groupId].svelte | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 6e5f337314..bd5b1b3b07 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -86,14 +86,14 @@ let popover let searchTerm = "" let prevSearch = undefined - let pageInfo = createPaginationStore() + let searchUsersPageInfo = createPaginationStore() let loaded = false let editModal, deleteModal $: scimEnabled = $features.isScimEnabled $: readonly = !$auth.isAdmin || scimEnabled - $: page = $pageInfo.page - $: fetchUsers(page, searchTerm) + $: page = $searchUsersPageInfo.page + $: searchUsers(page, searchTerm) $: group = $groups.find(x => x._id === groupId) $: filtered = $users.data $: groupApps = $apps @@ -112,20 +112,20 @@ } } - async function fetchUsers(page, search) { - if ($pageInfo.loading) { + async function searchUsers(page, search) { + if ($searchUsersPageInfo.loading) { return } // need to remove the page if they've started searching if (search && !prevSearch) { - pageInfo.reset() + searchUsersPageInfo.reset() page = undefined } prevSearch = search try { - pageInfo.loading() + searchUsersPageInfo.loading() await users.search({ page, email: search }) - pageInfo.fetched($users.hasNextPage, $users.nextPage) + searchUsersPageInfo.fetched($users.hasNextPage, $users.nextPage) } catch (error) { notifications.error("Error getting user list") } From 89afec9bfc3c45d775183979f956d61309f2719f Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 11:13:09 +0100 Subject: [PATCH 270/521] Refetch users on changes --- .../builder/portal/users/groups/[groupId].svelte | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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 bd5b1b3b07..d91c793cf1 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -151,6 +151,7 @@ const removeUser = async id => { await groups.actions.removeUser(groupId, id) + fetchGroupUsers.refresh() } const removeApp = async app => { @@ -218,15 +219,21 @@ labelKey="email" selected={group.users?.map(user => user._id)} list={$users.data} - on:select={e => groups.actions.addUser(groupId, e.detail)} - on:deselect={e => groups.actions.removeUser(groupId, e.detail)} + on:select={async e => { + await groups.actions.addUser(groupId, e.detail) + fetchGroupUsers.refresh() + }} + on:deselect={async e => { + await groups.actions.removeUser(groupId, e.detail) + fetchGroupUsers.refresh() + }} />
Date: Fri, 5 May 2023 11:34:20 +0100 Subject: [PATCH 271/521] Refetch initial data instead of refreshing --- .../src/pages/builder/portal/users/groups/[groupId].svelte | 7 +++---- 1 file changed, 3 insertions(+), 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 d91c793cf1..8acd4959b4 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -95,7 +95,6 @@ $: page = $searchUsersPageInfo.page $: searchUsers(page, searchTerm) $: group = $groups.find(x => x._id === groupId) - $: filtered = $users.data $: groupApps = $apps .filter(app => groups.actions @@ -151,7 +150,7 @@ const removeUser = async id => { await groups.actions.removeUser(groupId, id) - fetchGroupUsers.refresh() + fetchGroupUsers.getInitialData() } const removeApp = async app => { @@ -221,11 +220,11 @@ list={$users.data} on:select={async e => { await groups.actions.addUser(groupId, e.detail) - fetchGroupUsers.refresh() + fetchGroupUsers.getInitialData() }} on:deselect={async e => { await groups.actions.removeUser(groupId, e.detail) - fetchGroupUsers.refresh() + fetchGroupUsers.getInitialData() }} /> From 5e8a2de089b86440f6ba03c373dae7f56fd8f8d9 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 12:10:49 +0100 Subject: [PATCH 272/521] Handle cursors on refresh --- .../builder/portal/users/groups/[groupId].svelte | 2 +- packages/frontend-core/src/fetch/DataFetch.js | 13 ++++++++++++- 2 files changed, 13 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 8acd4959b4..589df5c599 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -150,7 +150,7 @@ const removeUser = async id => { await groups.actions.removeUser(groupId, id) - fetchGroupUsers.getInitialData() + fetchGroupUsers.refresh() } const removeApp = async app => { diff --git a/packages/frontend-core/src/fetch/DataFetch.js b/packages/frontend-core/src/fetch/DataFetch.js index f68b37dcca..c49d8c29fb 100644 --- a/packages/frontend-core/src/fetch/DataFetch.js +++ b/packages/frontend-core/src/fetch/DataFetch.js @@ -362,13 +362,24 @@ export default class DataFetch { return } this.store.update($store => ({ ...$store, loading: true })) - const { rows, info, error } = await this.getPage() + const { rows, info, error, cursor } = await this.getPage() + + let { cursors } = get(this.store) + const { pageNumber } = get(this.store) + + const currentNextCursor = cursors[pageNumber + 1] + if (currentNextCursor != cursor) { + cursors = cursors.slice(0, pageNumber + 1) + cursors[pageNumber + 1] = cursor + } + this.store.update($store => ({ ...$store, rows, info, loading: false, error, + cursors, })) } From 916edf47d430fcd4a8067870760d4fcd22b607eb Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 13:03:53 +0100 Subject: [PATCH 273/521] Handling last page removed --- packages/frontend-core/src/fetch/DataFetch.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/frontend-core/src/fetch/DataFetch.js b/packages/frontend-core/src/fetch/DataFetch.js index c49d8c29fb..cc931bfe06 100644 --- a/packages/frontend-core/src/fetch/DataFetch.js +++ b/packages/frontend-core/src/fetch/DataFetch.js @@ -369,10 +369,20 @@ export default class DataFetch { const currentNextCursor = cursors[pageNumber + 1] if (currentNextCursor != cursor) { + // If the current cursor changed, all the next pages need to be updated, so we mark them as stale cursors = cursors.slice(0, pageNumber + 1) cursors[pageNumber + 1] = cursor } + if (!rows.length && pageNumber > 0) { + this.store.update($store => ({ + ...$store, + loading: false, + cursors: cursors.slice(0, pageNumber), + })) + return await this.prevPage() + } + this.store.update($store => ({ ...$store, rows, From d79af79bf1b2339ee81e8d41bd03fb052b650823 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 13:05:08 +0100 Subject: [PATCH 274/521] Comment --- packages/frontend-core/src/fetch/DataFetch.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/frontend-core/src/fetch/DataFetch.js b/packages/frontend-core/src/fetch/DataFetch.js index cc931bfe06..18a00c08d5 100644 --- a/packages/frontend-core/src/fetch/DataFetch.js +++ b/packages/frontend-core/src/fetch/DataFetch.js @@ -367,14 +367,8 @@ export default class DataFetch { let { cursors } = get(this.store) const { pageNumber } = get(this.store) - const currentNextCursor = cursors[pageNumber + 1] - if (currentNextCursor != cursor) { - // If the current cursor changed, all the next pages need to be updated, so we mark them as stale - cursors = cursors.slice(0, pageNumber + 1) - cursors[pageNumber + 1] = cursor - } - if (!rows.length && pageNumber > 0) { + // If the full page is gone but we have previous pages, navigate to the previous page this.store.update($store => ({ ...$store, loading: false, @@ -383,6 +377,13 @@ export default class DataFetch { return await this.prevPage() } + const currentNextCursor = cursors[pageNumber + 1] + if (currentNextCursor != cursor) { + // If the current cursor changed, all the next pages need to be updated, so we mark them as stale + cursors = cursors.slice(0, pageNumber + 1) + cursors[pageNumber + 1] = cursor + } + this.store.update($store => ({ ...$store, rows, From 21d0bbcb1ef6f7429883500feedadb2594571e82 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 16:33:28 +0100 Subject: [PATCH 275/521] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 79bc94b17b..7f134dc875 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 79bc94b17baba885eb20e72f9abba3ac8b9c0eab +Subproject commit 7f134dc8758ca5ba6d7997bc23f1214a6ba8dd57 From f8ccee80df748211e71df22e2138a874c2e7ed78 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 16:50:06 +0100 Subject: [PATCH 276/521] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 7f134dc875..e3c156628b 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 7f134dc8758ca5ba6d7997bc23f1214a6ba8dd57 +Subproject commit e3c156628b5b67d3c8f3044e64b529405f50610b From 57a633b926f5fbcedc53e549bd63314a1e8d6870 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 5 May 2023 17:40:39 +0100 Subject: [PATCH 277/521] Implementing main body of connection verification endpoint. --- .../server/src/api/controllers/datasource.ts | 121 +++++++++++------- packages/server/src/api/routes/datasource.ts | 5 + packages/types/src/api/web/app/datasource.ts | 8 ++ 3 files changed, 85 insertions(+), 49 deletions(-) diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index b61b168980..e6866d528c 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -18,11 +18,68 @@ import { Row, CreateDatasourceResponse, UpdateDatasourceResponse, - UpdateDatasourceRequest, CreateDatasourceRequest, + VerifyDatasourceRequest, + VerifyDatasourceResponse, + IntegrationBase, + DatasourcePlus, } from "@budibase/types" import sdk from "../../sdk" +function getErrorTables(errors: any, errorType: string) { + return Object.entries(errors) + .filter(entry => entry[1] === errorType) + .map(([name]) => name) +} + +function updateError(error: any, newError: any, tables: string[]) { + if (!error) { + error = "" + } + if (error.length > 0) { + error += "\n" + } + error += `${newError} ${tables.join(", ")}` + return error +} + +async function getConnector( + datasource: Datasource +): Promise { + const Connector = await getIntegration(datasource.source) + datasource = await sdk.datasources.enrich(datasource) + // Connect to the DB and build the schema + return new Connector(datasource.config) +} + +async function buildSchemaHelper(datasource: Datasource) { + const connector = (await getConnector(datasource)) as DatasourcePlus + await connector.buildSchema(datasource._id!, datasource.entities!) + + const errors = connector.schemaErrors + let error = null + if (errors && Object.keys(errors).length > 0) { + const noKey = getErrorTables(errors, BuildSchemaErrors.NO_KEY) + const invalidCol = getErrorTables(errors, BuildSchemaErrors.INVALID_COLUMN) + if (noKey.length) { + error = updateError( + error, + "No primary key constraint found for the following:", + noKey + ) + } + if (invalidCol.length) { + const invalidCols = Object.values(InvalidColumns).join(", ") + error = updateError( + error, + `Cannot use columns ${invalidCols} found in following:`, + invalidCol + ) + } + } + return { tables: connector.tables, error } +} + export async function fetch(ctx: UserCtx) { // Get internal tables const db = context.getAppDB() @@ -66,6 +123,20 @@ export async function fetch(ctx: UserCtx) { ctx.body = [bbInternalDb, ...datasources] } +export async function verify( + ctx: UserCtx +) { + const datasource = ctx.request.body.datasource + const connector = (await getConnector(datasource)) as IntegrationBase + if (!connector.connection) { + ctx.throw(400, "Connection information verification not supported") + } + const connectionInfo = await connector.connection() + ctx.body = { + connected: connectionInfo.connected, + } +} + export async function buildSchemaFromDb(ctx: UserCtx) { const db = context.getAppDB() const datasource = await sdk.datasources.get(ctx.params.datasourceId) @@ -311,51 +382,3 @@ export async function query(ctx: UserCtx) { ctx.throw(400, err) } } - -function getErrorTables(errors: any, errorType: string) { - return Object.entries(errors) - .filter(entry => entry[1] === errorType) - .map(([name]) => name) -} - -function updateError(error: any, newError: any, tables: string[]) { - if (!error) { - error = "" - } - if (error.length > 0) { - error += "\n" - } - error += `${newError} ${tables.join(", ")}` - return error -} - -async function buildSchemaHelper(datasource: Datasource) { - const Connector = await getIntegration(datasource.source) - datasource = await sdk.datasources.enrich(datasource) - // Connect to the DB and build the schema - const connector = new Connector(datasource.config) - await connector.buildSchema(datasource._id, datasource.entities) - - const errors = connector.schemaErrors - let error = null - if (errors && Object.keys(errors).length > 0) { - const noKey = getErrorTables(errors, BuildSchemaErrors.NO_KEY) - const invalidCol = getErrorTables(errors, BuildSchemaErrors.INVALID_COLUMN) - if (noKey.length) { - error = updateError( - error, - "No primary key constraint found for the following:", - noKey - ) - } - if (invalidCol.length) { - const invalidCols = Object.values(InvalidColumns).join(", ") - error = updateError( - error, - `Cannot use columns ${invalidCols} found in following:`, - invalidCol - ) - } - } - return { tables: connector.tables, error } -} diff --git a/packages/server/src/api/routes/datasource.ts b/packages/server/src/api/routes/datasource.ts index 85929d2180..654fb794e3 100644 --- a/packages/server/src/api/routes/datasource.ts +++ b/packages/server/src/api/routes/datasource.ts @@ -15,6 +15,11 @@ router authorized(permissions.BUILDER), datasourceController.fetch ) + .post( + "/api/datasources/verify", + authorized(permissions.BUILDER), + datasourceController.verify + ) .get( "/api/datasources/:datasourceId", authorized( diff --git a/packages/types/src/api/web/app/datasource.ts b/packages/types/src/api/web/app/datasource.ts index d54259eab5..36e081d9f6 100644 --- a/packages/types/src/api/web/app/datasource.ts +++ b/packages/types/src/api/web/app/datasource.ts @@ -14,6 +14,14 @@ export interface CreateDatasourceRequest { fetchSchema?: boolean } +export interface VerifyDatasourceRequest { + datasource: Datasource +} + +export interface VerifyDatasourceResponse { + connected: boolean +} + export interface UpdateDatasourceRequest extends Datasource { datasource: Datasource } From e4b0c55aa6175b493b9dcc97921275baf53fe5b4 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 20:10:54 +0100 Subject: [PATCH 278/521] Split group users component --- .../portal/users/groups/[groupId].svelte | 159 ++--------------- .../groups/_components/GroupUsers.svelte | 166 ++++++++++++++++++ 2 files changed, 179 insertions(+), 146 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte 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 589df5c599..08c32bfeb9 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -1,62 +1,28 @@ + +
+ Users + {#if !scimEnabled} +
+ +
+ {:else} + + {/if} + + user._id)} + list={$users.data} + on:select={async e => { + await groups.actions.addUser(groupId, e.detail) + fetchGroupUsers.getInitialData() + }} + on:deselect={async e => { + await groups.actions.removeUser(groupId, e.detail) + fetchGroupUsers.getInitialData() + }} + /> + +
+ +
$goto(`../users/${e.detail._id}`)} +> +
+ This user group doesn't have any users +
+
+ + + + From b1f1095c89d41722268b6a78a1ee33fb9786a381 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 20:21:06 +0100 Subject: [PATCH 279/521] Split components --- .../groups/_components/EditUserPicker.svelte | 59 +++++++++++++++++ .../groups/_components/GroupUsers.svelte | 64 ++----------------- 2 files changed, 64 insertions(+), 59 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/users/groups/_components/EditUserPicker.svelte diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/EditUserPicker.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/EditUserPicker.svelte new file mode 100644 index 0000000000..a71634b262 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/users/groups/_components/EditUserPicker.svelte @@ -0,0 +1,59 @@ + + +
+ +
+ + user._id)} + list={$users.data} + on:select={async e => { + await groups.actions.addUser(groupId, e.detail) + onUsersUpdated() + }} + on:deselect={async e => { + await groups.actions.removeUser(groupId, e.detail) + onUsersUpdated() + }} + /> + diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte index ecc896989a..9c18008e44 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte @@ -1,18 +1,11 @@ saveGroup(group)} + onConfirm={() => { + if (!group.name?.trim()) { + nameError = "Group name cannot be empty" + return false + } + saveGroup(group) + }} size="M" title={group?._rev ? "Edit group" : "Create group"} confirmText="Save" > - +
Icon From 80d3b99b90dba2d1e7b4c3bd16a573c63b814f78 Mon Sep 17 00:00:00 2001 From: jvcalderon Date: Mon, 8 May 2023 13:26:00 +0200 Subject: [PATCH 286/521] Provide some functions to check the path in the context --- .../src/utils/tests/utils.spec.ts | 77 +++++++++++++++++++ packages/backend-core/src/utils/utils.ts | 19 ++++- 2 files changed, 93 insertions(+), 3 deletions(-) diff --git a/packages/backend-core/src/utils/tests/utils.spec.ts b/packages/backend-core/src/utils/tests/utils.spec.ts index ededa48628..bea0bfa52b 100644 --- a/packages/backend-core/src/utils/tests/utils.spec.ts +++ b/packages/backend-core/src/utils/tests/utils.spec.ts @@ -5,6 +5,8 @@ import * as db from "../../db" import { Header } from "../../constants" import { newid } from "../../utils" import env from "../../environment" +import { beforeEach } from "@jest/globals" +import { BBContext } from "@budibase/types" describe("utils", () => { const config = new DBTestConfiguration() @@ -106,4 +108,79 @@ describe("utils", () => { expect(actual).toBe(undefined) }) }) + + describe("isServingBuilder", () => { + let ctx: BBContext + + const expectResult = (result: boolean) => + expect(utils.isServingBuilder(ctx)).toBe(result) + + beforeEach(() => { + ctx = structures.koa.newContext() + }) + + it("returns true if current path is in builder", async () => { + ctx.path = "/builder/app/app_" + expectResult(true) + }) + + it("returns false if current path is not in builder", async () => { + ctx.path = "/builder/app" + expectResult(false) + + ctx.path = "/xx" + expectResult(false) + }) + }) + + describe("isServingBuilderPreview", () => { + let ctx: BBContext + + const expectResult = (result: boolean) => + expect(utils.isServingBuilderPreview(ctx)).toBe(result) + + beforeEach(() => { + ctx = structures.koa.newContext() + }) + + it("returns true if current path is in builder preview", async () => { + ctx.path = "/app/preview/xx" + expectResult(true) + }) + + it("returns false if current path is not in builder preview", async () => { + ctx.path = "/builder" + expectResult(false) + + ctx.path = "/xx" + expectResult(false) + }) + }) + + describe("isPublicAPIRequest", () => { + let ctx: BBContext + + const expectResult = (result: boolean) => + expect(utils.isPublicApiRequest(ctx)).toBe(result) + + beforeEach(() => { + ctx = structures.koa.newContext() + }) + + it("returns true if current path remains to public API", async () => { + ctx.path = "/api/public/v1/invoices" + expectResult(true) + + ctx.path = "/api/public/v1" + expectResult(true) + }) + + it("returns false if current path doesn't remain to public API", async () => { + ctx.path = "/api/public" + expectResult(false) + + ctx.path = "/xx" + expectResult(false) + }) + }) }) diff --git a/packages/backend-core/src/utils/utils.ts b/packages/backend-core/src/utils/utils.ts index 75b098093b..6cbd1fc406 100644 --- a/packages/backend-core/src/utils/utils.ts +++ b/packages/backend-core/src/utils/utils.ts @@ -1,10 +1,9 @@ -import { getAllApps, queryGlobalView } from "../db" +import { getAllApps } from "../db" import { Header, MAX_VALID_DATE, DocumentType, SEPARATOR, - ViewName, } from "../constants" import env from "../environment" import * as tenancy from "../tenancy" @@ -23,7 +22,9 @@ const APP_PREFIX = DocumentType.APP + SEPARATOR const PROD_APP_PREFIX = "/app/" const BUILDER_PREVIEW_PATH = "/app/preview" -const BUILDER_REFERER_PREFIX = "/builder/app/" +const BUILDER_PREFIX = "/builder" +const BUILDER_REFERER_PREFIX = `${BUILDER_PREFIX}/app/` +const PUBLIC_API_PREFIX = "/api/public/v1" function confirmAppId(possibleAppId: string | undefined) { return possibleAppId && possibleAppId.startsWith(APP_PREFIX) @@ -69,6 +70,18 @@ export function isServingApp(ctx: Ctx) { return false } +export function isServingBuilder(ctx: Ctx): boolean { + return ctx.path.startsWith(BUILDER_REFERER_PREFIX) +} + +export function isServingBuilderPreview(ctx: Ctx): boolean { + return ctx.path.startsWith(BUILDER_PREVIEW_PATH) +} + +export function isPublicApiRequest(ctx: Ctx): boolean { + return ctx.path.startsWith(PUBLIC_API_PREFIX) +} + /** * Given a request tries to find the appId, which can be located in various places * @param {object} ctx The main request body to look through. From a4e97f768bf2d39560265255cca5d7cf548b5e3b Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 8 May 2023 13:26:26 +0200 Subject: [PATCH 287/521] Add group name limit --- packages/pro | 2 +- .../api/routes/global/tests/groups.spec.ts | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 124280d24f..3a6dba1a72 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 124280d24ff60446c166a005e3cc09c986565bb3 +Subproject commit 3a6dba1a7292384553900a284fa63422ee070bfa diff --git a/packages/worker/src/api/routes/global/tests/groups.spec.ts b/packages/worker/src/api/routes/global/tests/groups.spec.ts index 2dbf6edf30..5b7fb9db9e 100644 --- a/packages/worker/src/api/routes/global/tests/groups.spec.ts +++ b/packages/worker/src/api/routes/global/tests/groups.spec.ts @@ -57,6 +57,31 @@ describe("/api/global/groups", () => { expect.objectContaining({ name: "group name" }) ) }) + + describe("name max length", () => { + const maxLength = 50 + + it(`should allow names shorter than ${maxLength} characters`, async () => { + const group = { + ...structures.groups.UserGroup(), + name: structures.generator.word({ length: maxLength }), + } + await config.api.groups.saveGroup(group, { expect: 200 }) + }) + + it(`should not allow names longer than ${maxLength} characters`, async () => { + const group = { + ...structures.groups.UserGroup(), + name: structures.generator.word({ length: maxLength + 1 }), + } + const response = await config.api.groups.saveGroup(group, { + expect: 400, + }) + expect(JSON.parse(response.text).message).toEqual( + 'Invalid body - "name" length must be less than or equal to 50 characters long' + ) + }) + }) }) describe("update", () => { From d4d1bc03b31324c530b7f589cbd1ec402fdf739f Mon Sep 17 00:00:00 2001 From: jvcalderon Date: Mon, 8 May 2023 13:42:26 +0200 Subject: [PATCH 288/521] Fix ESLint --- packages/backend-core/src/utils/utils.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/backend-core/src/utils/utils.ts b/packages/backend-core/src/utils/utils.ts index 6cbd1fc406..aee672042b 100644 --- a/packages/backend-core/src/utils/utils.ts +++ b/packages/backend-core/src/utils/utils.ts @@ -1,10 +1,5 @@ import { getAllApps } from "../db" -import { - Header, - MAX_VALID_DATE, - DocumentType, - SEPARATOR, -} from "../constants" +import { Header, MAX_VALID_DATE, DocumentType, SEPARATOR } from "../constants" import env from "../environment" import * as tenancy from "../tenancy" import * as context from "../context" From b387f969d92c7e60cb0902124c56d8591b3f7155 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 8 May 2023 15:59:12 +0100 Subject: [PATCH 289/521] allow passwordless redis --- packages/backend-core/src/environment.ts | 2 +- packages/server/src/api/routes/public/index.ts | 9 ++++++--- yarn.lock | 12 ++++++------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts index 155f09e6d9..72cd1a4af0 100644 --- a/packages/backend-core/src/environment.ts +++ b/packages/backend-core/src/environment.ts @@ -95,7 +95,7 @@ const environment = { GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET, SALT_ROUNDS: process.env.SALT_ROUNDS, REDIS_URL: process.env.REDIS_URL || "localhost:6379", - REDIS_PASSWORD: process.env.REDIS_PASSWORD || "budibase", + REDIS_PASSWORD: process.env.REDIS_PASSWORD, REDIS_CLUSTERED: process.env.REDIS_CLUSTERED, MOCK_REDIS: process.env.MOCK_REDIS, MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts index bed798f75b..287f6c11de 100644 --- a/packages/server/src/api/routes/public/index.ts +++ b/packages/server/src/api/routes/public/index.ts @@ -42,13 +42,16 @@ if (!env.isTest()) { host: REDIS_OPTS.host, port: REDIS_OPTS.port, }, - password: - REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password, + } + + if (REDIS_OPTS.opts?.password || REDIS_OPTS.opts.redisOptions?.password) { + // @ts-ignore + options.password = REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password } if (!env.REDIS_CLUSTERED) { - // Can't set direct redis db in clustered env // @ts-ignore + // Can't set direct redis db in clustered env options.database = 1 } } diff --git a/yarn.lock b/yarn.lock index d293366bb3..4b2bab4ec2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.6": - version "2.6.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.6.tgz#337027168d17a44717c2648b3209a0e2daddcf7d" - integrity sha512-RldUn/WjN7eaYRxL4KBufK1yhVIycJOzoncD+BPgRKstuuuYzPultGZcpNsQQiJkAhNR6QXhG+ovvCUiA+AX6g== +"@budibase/pro@2.6.7": + version "2.6.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.7.tgz#884b33f3a3e3f2e548fd7519d32b40dc98803400" + integrity sha512-f7g+0So7hr7tHHEF28cz550imYpq/CqRNzhMQpUwmzgbdTlOdVej3PWPNK9+MuBlNea3J9b2WQsjS9TkGZfTlA== dependencies: - "@budibase/backend-core" "2.6.6" + "@budibase/backend-core" "2.6.7" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.6" + "@budibase/types" "2.6.7" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From eb37dacc733642a4b59bdfaafde5abfeeb01ef94 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 8 May 2023 16:23:49 +0100 Subject: [PATCH 290/521] lint --- packages/server/src/api/routes/public/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts index 287f6c11de..6852778e68 100644 --- a/packages/server/src/api/routes/public/index.ts +++ b/packages/server/src/api/routes/public/index.ts @@ -46,7 +46,8 @@ if (!env.isTest()) { if (REDIS_OPTS.opts?.password || REDIS_OPTS.opts.redisOptions?.password) { // @ts-ignore - options.password = REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password + options.password = + REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password } if (!env.REDIS_CLUSTERED) { From 86f0cd8353aefc899f8acdf5f961cd9f6c8315b7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 8 May 2023 15:52:34 +0000 Subject: [PATCH 291/521] v2.6.8 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 85c77624b8..202e1c6f49 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.7", + "version": "2.6.8", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4e186dd705..03dae9feca 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.7", + "version": "2.6.8", "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.6.7", + "@budibase/types": "^2.6.8", "@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 23a145e7c5..f0fe559705 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.6.7", + "version": "2.6.8", "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.6.7", - "@budibase/string-templates": "^2.6.7", + "@budibase/shared-core": "^2.6.8", + "@budibase/string-templates": "^2.6.8", "@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 b32d660471..1b69c7aaac 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.7", + "version": "2.6.8", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.7", - "@budibase/frontend-core": "^2.6.7", - "@budibase/shared-core": "^2.6.7", - "@budibase/string-templates": "^2.6.7", + "@budibase/bbui": "^2.6.8", + "@budibase/frontend-core": "^2.6.8", + "@budibase/shared-core": "^2.6.8", + "@budibase/string-templates": "^2.6.8", "@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 c80530f716..a28c66fe65 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.7", + "version": "2.6.8", "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.6.7", - "@budibase/string-templates": "^2.6.7", - "@budibase/types": "^2.6.7", + "@budibase/backend-core": "^2.6.8", + "@budibase/string-templates": "^2.6.8", + "@budibase/types": "^2.6.8", "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 c4d3c1b13b..46f365de5d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.7", + "version": "2.6.8", "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.6.7", - "@budibase/frontend-core": "^2.6.7", - "@budibase/shared-core": "^2.6.7", - "@budibase/string-templates": "^2.6.7", - "@budibase/types": "^2.6.7", + "@budibase/bbui": "^2.6.8", + "@budibase/frontend-core": "^2.6.8", + "@budibase/shared-core": "^2.6.8", + "@budibase/string-templates": "^2.6.8", + "@budibase/types": "^2.6.8", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 6d917cb863..e701687d10 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.7", + "version": "2.6.8", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.6.7", - "@budibase/shared-core": "^2.6.7", + "@budibase/bbui": "^2.6.8", + "@budibase/shared-core": "^2.6.8", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 3df72d79fb..5b528a145a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.7", + "version": "2.6.8", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a8c04bf14e..4e47134947 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.7", + "version": "2.6.8", "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.6.7", - "@budibase/client": "^2.6.7", + "@budibase/backend-core": "^2.6.8", + "@budibase/client": "^2.6.8", "@budibase/pro": "2.6.7", - "@budibase/shared-core": "^2.6.7", - "@budibase/string-templates": "^2.6.7", - "@budibase/types": "^2.6.7", + "@budibase/shared-core": "^2.6.8", + "@budibase/string-templates": "^2.6.8", + "@budibase/types": "^2.6.8", "@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 e1e4a01f52..68d9824126 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.7", + "version": "2.6.8", "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.6.7" + "@budibase/types": "^2.6.8" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index a02d13b3b6..105cb98472 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.7", + "version": "2.6.8", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index a39114a76d..1e8e46c44d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.7", + "version": "2.6.8", "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 59e7f18d76..6e44e82649 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.7", + "version": "2.6.8", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.6.7", + "@budibase/backend-core": "^2.6.8", "@budibase/pro": "2.6.7", - "@budibase/string-templates": "^2.6.7", - "@budibase/types": "^2.6.7", + "@budibase/string-templates": "^2.6.8", + "@budibase/types": "^2.6.8", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From bd13a2d186819e4159b076c92e23b9852a5e49db Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 8 May 2023 15:54:09 +0000 Subject: [PATCH 292/521] Update pro version to 2.6.8 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 4e47134947..7be437535e 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.6.8", "@budibase/client": "^2.6.8", - "@budibase/pro": "2.6.7", + "@budibase/pro": "2.6.8", "@budibase/shared-core": "^2.6.8", "@budibase/string-templates": "^2.6.8", "@budibase/types": "^2.6.8", diff --git a/packages/worker/package.json b/packages/worker/package.json index 6e44e82649..ebbe5d62bd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.8", - "@budibase/pro": "2.6.7", + "@budibase/pro": "2.6.8", "@budibase/string-templates": "^2.6.8", "@budibase/types": "^2.6.8", "@koa/router": "8.0.8", From bbf271961f95cf1d7997eb9d13bb84a8a4d00b23 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 9 May 2023 11:48:49 +0100 Subject: [PATCH 293/521] adding healthcheck to proxy service --- hosting/proxy/nginx.prod.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosting/proxy/nginx.prod.conf b/hosting/proxy/nginx.prod.conf index dce1a71918..1a4415395b 100644 --- a/hosting/proxy/nginx.prod.conf +++ b/hosting/proxy/nginx.prod.conf @@ -82,6 +82,12 @@ http { set $couchdb ${COUCHDB_UPSTREAM_URL}; set $watchtower ${WATCHTOWER_UPSTREAM_URL}; + location /health { + access_log off; + add_header 'Content-Type' 'application/json'; + return 200 '{ "status": "OK" }'; + } + location /app { proxy_pass $apps; } From fb54b6de607f8067e6f21d23c0196ead60176ad3 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Tue, 9 May 2023 12:05:12 +0100 Subject: [PATCH 294/521] Add pagination to Google Sheets (#10525) * Add pagination to Google Sheets * Default limit to 100 --- .../server/src/integrations/googlesheets.ts | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index 476a6511e9..644f650ea3 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -15,7 +15,7 @@ import { } from "@budibase/types" import { OAuth2Client } from "google-auth-library" import { buildExternalTableId, finaliseExternalTables } from "./utils" -import { GoogleSpreadsheet } from "google-spreadsheet" +import { GoogleSpreadsheet, GoogleSpreadsheetRow } from "google-spreadsheet" import fetch from "node-fetch" import { configs, HTTPError } from "@budibase/backend-core" import { dataFilters } from "@budibase/shared-core" @@ -434,7 +434,20 @@ class GoogleSheetsIntegration implements DatasourcePlus { try { await this.connect() const sheet = this.client.sheetsByTitle[query.sheet] - const rows = await sheet.getRows() + let rows: GoogleSpreadsheetRow[] = [] + if (query.paginate) { + const limit = query.paginate.limit || 100 + let page: number = + typeof query.paginate.page === "number" + ? query.paginate.page + : parseInt(query.paginate.page || "1") + rows = await sheet.getRows({ + limit, + offset: (page - 1) * limit, + }) + } else { + rows = await sheet.getRows() + } const filtered = dataFilters.runLuceneQuery(rows, query.filters) const headerValues = sheet.headerValues let response = [] From c8da2d57172c6848057f4a3971a6bca6f829a326 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 9 May 2023 11:08:12 +0000 Subject: [PATCH 295/521] Bump version to 2.6.8-alpha.3 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index e25c4d44fc..d1d1c7c3d1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.8-alpha.2", + "version": "2.6.8-alpha.3", "npmClient": "yarn", "packages": [ "packages/backend-core", From 62238611bfa603a9af5d37c50fa1ded61e47999c Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Tue, 9 May 2023 18:32:17 +0100 Subject: [PATCH 296/521] Add base api class --- qa-core/src/internal-api/api/apis/BaseAPI.ts | 52 ++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 qa-core/src/internal-api/api/apis/BaseAPI.ts diff --git a/qa-core/src/internal-api/api/apis/BaseAPI.ts b/qa-core/src/internal-api/api/apis/BaseAPI.ts new file mode 100644 index 0000000000..6edbc10701 --- /dev/null +++ b/qa-core/src/internal-api/api/apis/BaseAPI.ts @@ -0,0 +1,52 @@ +import { Response } from "node-fetch" +import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" + +export default class BaseAPI { + client: BudibaseInternalAPIClient + + constructor(client: BudibaseInternalAPIClient) { + this.client = client + } + + async get(url: string): Promise<[Response, any]> { + const [response, json] = await this.client.get(url) + expect(response).toHaveStatusCode(200) + return [response, json] + } + + async post( + url: string, + body?: any, + statusCode?: number + ): Promise<[Response, any]> { + const [response, json] = await this.client.post(url, { body }) + expect(response).toHaveStatusCode(statusCode ? statusCode : 200) + return [response, json] + } + + async put( + url: string, + body?: any, + statusCode?: number + ): Promise<[Response, any]> { + const [response, json] = await this.client.put(url, { body }) + expect(response).toHaveStatusCode(statusCode ? statusCode : 200) + return [response, json] + } + + async patch( + url: string, + body?: any, + statusCode?: number + ): Promise<[Response, any]> { + const [response, json] = await this.client.patch(url, { body }) + expect(response).toHaveStatusCode(statusCode ? statusCode : 200) + return [response, json] + } + + async del(url: string, statusCode?: number): Promise<[Response, any]> { + const [response, json] = await this.client.del(url) + expect(response).toHaveStatusCode(statusCode ? statusCode : 200) + return [response, json] + } +} From d2da7ea3986ad71d3dceaed5d3f42178d18265e1 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 10 May 2023 10:21:05 +0200 Subject: [PATCH 297/521] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index e3c156628b..64ff0f044f 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit e3c156628b5b67d3c8f3044e64b529405f50610b +Subproject commit 64ff0f044f8d80f2feb24331ca4fc0f51197c813 From 0c95e07183dd36fcf0497797fe48d41f8dcf4035 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 10 May 2023 10:28:40 +0200 Subject: [PATCH 298/521] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 546ca5e9fb..cb75e655eb 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 546ca5e9fb90b65c8a566da5d3ce295a24cd21b0 +Subproject commit cb75e655eb70818d35515a11b2c3113973631900 From 453c4a41eb5f9125cec798768814ee081f7c6c8c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 10 May 2023 08:28:54 +0000 Subject: [PATCH 299/521] Bump version to 2.6.8-alpha.4 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index d1d1c7c3d1..5de9b25d55 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.8-alpha.3", + "version": "2.6.8-alpha.4", "npmClient": "yarn", "packages": [ "packages/backend-core", From 96a3a3095bd9f4393af47d1f1b616c0da53572e0 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 10 May 2023 09:01:08 +0000 Subject: [PATCH 300/521] Bump version to 2.6.8-alpha.5 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 5de9b25d55..f952b0fc92 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.8-alpha.4", + "version": "2.6.8-alpha.5", "npmClient": "yarn", "packages": [ "packages/backend-core", From e318eda5f494bf74956715c2f1b6c22a4fe8f12a Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 10 May 2023 11:44:05 +0200 Subject: [PATCH 301/521] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index cb75e655eb..a0a7b5e156 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit cb75e655eb70818d35515a11b2c3113973631900 +Subproject commit a0a7b5e1566467cc0625fb69309364c750847962 From 8bbfa7e0ab09e053bc2c2ab4a5823e1a75dca534 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 10 May 2023 12:31:09 +0200 Subject: [PATCH 302/521] Dynamic groups for testing --- .../worker/src/tests/structures/groups.ts | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/packages/worker/src/tests/structures/groups.ts b/packages/worker/src/tests/structures/groups.ts index 0f7e518895..33af533bd4 100644 --- a/packages/worker/src/tests/structures/groups.ts +++ b/packages/worker/src/tests/structures/groups.ts @@ -1,10 +1,25 @@ +import { generator } from "@budibase/backend-core/tests" +import { db } from "@budibase/backend-core" +import { UserGroupRoles } from "@budibase/types" + export const UserGroup = () => { + const appsCount = generator.integer({ min: 0, max: 3 }) + const roles = Array.from({ length: appsCount }).reduce( + (p: UserGroupRoles, v) => { + return { + ...p, + [db.generateAppID()]: generator.pickone(["ADMIN", "POWER", "BASIC"]), + } + }, + {} + ) + let group = { apps: [], - color: "var(--spectrum-global-color-blue-600)", - icon: "UserGroup", - name: "New group", - roles: { app_uuid1: "ADMIN", app_uuid2: "POWER" }, + color: generator.color(), + icon: generator.word(), + name: generator.word({ length: 2 }), + roles: roles, users: [], } return group From d33a06c89c810e0348e44d71084c39a8aa73901a Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 8 May 2023 14:54:43 +0200 Subject: [PATCH 303/521] Send search term to api call --- .../groups/_components/GroupUsers.svelte | 21 +++++++++++++++++-- packages/frontend-core/src/api/groups.js | 7 +++++-- .../frontend-core/src/fetch/GroupUserFetch.js | 1 + 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte index 9c18008e44..fbc3dd5ac1 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte @@ -1,7 +1,7 @@
- Users {#if !scimEnabled} {:else} {/if} -
-
- +
+ +
Date: Wed, 10 May 2023 16:00:12 +0100 Subject: [PATCH 321/521] Add grid menu items to copy row ID and rev --- .../grid/overlays/MenuOverlay.svelte | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte b/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte index 89e4d3503b..d0379edee6 100644 --- a/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte +++ b/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte @@ -1,5 +1,11 @@ {#if $menu.visible} @@ -64,6 +75,22 @@ > Edit row in modal + copyToClipboard($focusedRow?._id)} + on:click={menu.actions.close} + > + Copy row _id + + copyToClipboard($focusedRow?._rev)} + on:click={menu.actions.close} + > + Copy row _rev + Date: Wed, 10 May 2023 16:00:27 +0100 Subject: [PATCH 322/521] Fix not properly updating row state for formula columns --- packages/frontend-core/src/components/grid/stores/rows.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.js index 694b66629b..b6dc8c05d0 100644 --- a/packages/frontend-core/src/components/grid/stores/rows.js +++ b/packages/frontend-core/src/components/grid/stores/rows.js @@ -338,15 +338,11 @@ export const deriveStores = context => { ...state, [rowId]: true, })) - const newRow = { ...row, ...get(rowChangeCache)[rowId] } - const saved = await API.saveRow(newRow) + const saved = await API.saveRow({ ...row, ...get(rowChangeCache)[rowId] }) // Update state after a successful change rows.update(state => { - state[index] = { - ...newRow, - _rev: saved._rev, - } + state[index] = saved return state.slice() }) rowChangeCache.update(state => { From d146aae08421048081df090d0d9f19fe704fb8eb Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 10 May 2023 16:02:00 +0100 Subject: [PATCH 323/521] Treat formula cell as readonly! --- packages/frontend-core/src/components/grid/cells/DataCell.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend-core/src/components/grid/cells/DataCell.svelte b/packages/frontend-core/src/components/grid/cells/DataCell.svelte index 0aa0cd54f4..f39b820632 100644 --- a/packages/frontend-core/src/components/grid/cells/DataCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/DataCell.svelte @@ -32,6 +32,7 @@ $: readonly = column.schema.autocolumn || column.schema.disabled || + column.schema.type === "formula" || (!$config.allowEditRows && row._id) // Register this cell API if the row is focused From fc61623e32580469b72fb287ad127611299c4c23 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Wed, 10 May 2023 16:53:20 +0100 Subject: [PATCH 324/521] Improve internal API classes --- qa-core/src/internal-api/api/apis/AppAPI.ts | 76 +++++++------------ .../internal-api/api/apis/DatasourcesAPI.ts | 48 ++++-------- .../internal-api/api/apis/IntegrationsAPI.ts | 10 +-- .../internal-api/api/apis/PermissionsAPI.ts | 10 +-- .../src/internal-api/api/apis/QueriesAPI.ts | 20 ++--- qa-core/src/internal-api/api/apis/RoleAPI.ts | 13 ++-- qa-core/src/internal-api/api/apis/RowAPI.ts | 29 ++----- .../src/internal-api/api/apis/ScreenAPI.ts | 15 ++-- qa-core/src/internal-api/api/apis/SelfAPI.ts | 16 ++-- qa-core/src/internal-api/api/apis/TableAPI.ts | 23 ++---- qa-core/src/internal-api/api/apis/UserAPI.ts | 58 +++++--------- 11 files changed, 110 insertions(+), 208 deletions(-) diff --git a/qa-core/src/internal-api/api/apis/AppAPI.ts b/qa-core/src/internal-api/api/apis/AppAPI.ts index 992728899e..6a7d5cd99a 100644 --- a/qa-core/src/internal-api/api/apis/AppAPI.ts +++ b/qa-core/src/internal-api/api/apis/AppAPI.ts @@ -7,78 +7,64 @@ import { MessageResponse, } from "../../../types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" +import BaseAPI from "./BaseAPI" -export default class AppAPI { - client: BudibaseInternalAPIClient - +export default class AppAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { - this.client = client + super(client) } // TODO Fix the fetch apps to receive an optional number of apps and compare if the received app is more or less. // each possible scenario should have its own method. async fetchEmptyAppList(): Promise<[Response, App[]]> { - const [response, json] = await this.client.get(`/applications?status=all`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/applications?status=all`) expect(json.length).toBeGreaterThanOrEqual(0) return [response, json] } async fetchAllApplications(): Promise<[Response, App[]]> { - const [response, json] = await this.client.get(`/applications?status=all`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/applications?status=all`) expect(json.length).toBeGreaterThanOrEqual(1) return [response, json] } async canRender(): Promise<[Response, boolean]> { - const [response, json] = await this.client.get("/routing/client") - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get("/routing/client") const publishedAppRenders = Object.keys(json.routes).length > 0 expect(publishedAppRenders).toBe(true) return [response, publishedAppRenders] } async getAppPackage(appId: string): Promise<[Response, AppPackageResponse]> { - const [response, json] = await this.client.get( - `/applications/${appId}/appPackage` - ) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/applications/${appId}/appPackage`) expect(json.application.appId).toEqual(appId) return [response, json] } async publish(appId: string | undefined): Promise<[Response, DeployConfig]> { - const [response, json] = await this.client.post( - `/applications/${appId}/publish` - ) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/applications/${appId}/publish`) return [response, json] } async create(body: any): Promise { - const [response, json] = await this.client.post(`/applications`, { body }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/applications`, body) expect(json._id).toBeDefined() return json } async read(id: string): Promise<[Response, App]> { - const [response, json] = await this.client.get(`/applications/${id}`) + const [response, json] = await this.get(`/applications/${id}`) return [response, json.data] } async sync(appId: string): Promise<[Response, MessageResponse]> { - const [response, json] = await this.client.post( - `/applications/${appId}/sync` - ) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/applications/${appId}/sync`) return [response, json] } // TODO async updateClient(appId: string, body: any): Promise<[Response, App]> { - const [response, json] = await this.client.put( + const [response, json] = await this.put( `/applications/${appId}/client/update`, { body } ) @@ -86,8 +72,7 @@ export default class AppAPI { } async revertPublished(appId: string): Promise<[Response, MessageResponse]> { - const [response, json] = await this.client.post(`/dev/${appId}/revert`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/dev/${appId}/revert`) expect(json).toEqual({ message: "Reverted changes successfully.", }) @@ -95,8 +80,11 @@ export default class AppAPI { } async revertUnpublished(appId: string): Promise<[Response, MessageResponse]> { - const [response, json] = await this.client.post(`/dev/${appId}/revert`) - expect(response).toHaveStatusCode(400) + const [response, json] = await this.post( + `/dev/${appId}/revert`, + undefined, + 400 + ) expect(json).toEqual({ message: "App has not yet been deployed", status: 400, @@ -105,8 +93,7 @@ export default class AppAPI { } async delete(appId: string): Promise { - const [response, _] = await this.client.del(`/applications/${appId}`) - expect(response).toHaveStatusCode(200) + const [response, _] = await this.del(`/applications/${appId}`) return response } @@ -115,22 +102,18 @@ export default class AppAPI { oldName: string, body: any ): Promise<[Response, App]> { - const [response, json] = await this.client.put(`/applications/${appId}`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.put(`/applications/${appId}`, body) expect(json.name).not.toEqual(oldName) return [response, json] } async addScreentoApp(body: any): Promise<[Response, App]> { - const [response, json] = await this.client.post(`/screens`, { body }) + const [response, json] = await this.post(`/screens`, body) return [response, json] } async getRoutes(screenExists?: boolean): Promise<[Response, RouteConfig]> { - const [response, json] = await this.client.get(`/routing`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/routing`) if (screenExists) { expect(json.routes["/test"]).toBeTruthy() } else { @@ -141,16 +124,16 @@ export default class AppAPI { } async unpublish(appId: string): Promise<[Response]> { - const [response, json] = await this.client.post( - `/applications/${appId}/unpublish` + const [response, json] = await this.post( + `/applications/${appId}/unpublish`, + undefined, + 204 ) - expect(response).toHaveStatusCode(204) return [response] } async unlock(appId: string): Promise<[Response, MessageResponse]> { - const [response, json] = await this.client.del(`/dev/${appId}/lock`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.del(`/dev/${appId}/lock`) expect(json.message).toEqual("Lock released successfully.") return [response, json] } @@ -162,10 +145,7 @@ export default class AppAPI { color: "var(--spectrum-global-color-red-400)", }, } - const [response, json] = await this.client.put(`/applications/${appId}`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.put(`/applications/${appId}`, body) expect(json.icon.name).toEqual(body.icon.name) expect(json.icon.color).toEqual(body.icon.color) return [response, json] diff --git a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts index f29bb9d6bc..3fec8e8189 100644 --- a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts +++ b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts @@ -5,41 +5,34 @@ import { UpdateDatasourceResponse, } from "@budibase/types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" +import BaseAPI from "./BaseAPI" -export default class DatasourcesAPI { - client: BudibaseInternalAPIClient - +export default class DatasourcesAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { - this.client = client + super(client) } async getIntegrations(): Promise<[Response, any]> { - const [response, json] = await this.client.get(`/integrations`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/integrations`) const integrationsCount = Object.keys(json).length expect(integrationsCount).toBe(16) return [response, json] } async getAll(): Promise<[Response, Datasource[]]> { - const [response, json] = await this.client.get(`/datasources`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/datasources`) expect(json.length).toBeGreaterThan(0) return [response, json] } async getTable(dataSourceId: string): Promise<[Response, Datasource]> { - const [response, json] = await this.client.get( - `/datasources/${dataSourceId}` - ) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/datasources/${dataSourceId}`) expect(json._id).toEqual(dataSourceId) return [response, json] } async add(body: any): Promise<[Response, CreateDatasourceResponse]> { - const [response, json] = await this.client.post(`/datasources`, { body }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/datasources`, body) expect(json.datasource._id).toBeDefined() expect(json.datasource._rev).toBeDefined() @@ -47,10 +40,7 @@ export default class DatasourcesAPI { } async update(body: any): Promise<[Response, UpdateDatasourceResponse]> { - const [response, json] = await this.client.put(`/datasources/${body._id}`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.put(`/datasources/${body._id}`, body) expect(json.datasource._id).toBeDefined() expect(json.datasource._rev).toBeDefined() @@ -58,38 +48,32 @@ export default class DatasourcesAPI { } async previewQuery(body: any): Promise<[Response, any]> { - const [response, json] = await this.client.post(`/queries/preview`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/queries/preview`, body) return [response, json] } async saveQuery(body: any): Promise<[Response, any]> { - const [response, json] = await this.client.post(`/queries`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/queries`, body) return [response, json] } async getQuery(queryId: string): Promise<[Response, any]> { - const [response, json] = await this.client.get(`/queries/${queryId}`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/queries/${queryId}`) + return [response, json] } async getQueryPermissions(queryId: string): Promise<[Response, any]> { - const [response, json] = await this.client.get(`/permissions/${queryId}`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/permissions/${queryId}`) + return [response, json] } async delete(dataSourceId: string, revId: string): Promise { - const [response, json] = await this.client.del( + const [response, json] = await this.del( `/datasources/${dataSourceId}/${revId}` ) - expect(response).toHaveStatusCode(200) + return response } } diff --git a/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts b/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts index 2478823bfa..66d086357a 100644 --- a/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts +++ b/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts @@ -1,16 +1,14 @@ import { Response } from "node-fetch" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" +import BaseAPI from "./BaseAPI" -export default class IntegrationsAPI { - client: BudibaseInternalAPIClient - +export default class IntegrationsAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { - this.client = client + super(client) } async getAll(): Promise<[Response, any]> { - const [response, json] = await this.client.get(`/integrations`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/integrations`) const integrationsCount = Object.keys(json).length expect(integrationsCount).toBeGreaterThan(0) return [response, json] diff --git a/qa-core/src/internal-api/api/apis/PermissionsAPI.ts b/qa-core/src/internal-api/api/apis/PermissionsAPI.ts index e78ef7560d..126d4eb430 100644 --- a/qa-core/src/internal-api/api/apis/PermissionsAPI.ts +++ b/qa-core/src/internal-api/api/apis/PermissionsAPI.ts @@ -1,16 +1,14 @@ import { Response } from "node-fetch" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" +import BaseAPI from "./BaseAPI" -export default class PermissionsAPI { - client: BudibaseInternalAPIClient - +export default class PermissionsAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { - this.client = client + super(client) } async getAll(id: string): Promise<[Response, any]> { - const [response, json] = await this.client.get(`/permissions/${id}`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/permissions/${id}`) return [response, json] } } diff --git a/qa-core/src/internal-api/api/apis/QueriesAPI.ts b/qa-core/src/internal-api/api/apis/QueriesAPI.ts index 5c8ac9883e..b47c379191 100644 --- a/qa-core/src/internal-api/api/apis/QueriesAPI.ts +++ b/qa-core/src/internal-api/api/apis/QueriesAPI.ts @@ -1,33 +1,25 @@ import { Response } from "node-fetch" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" import { PreviewQueryRequest, Query } from "@budibase/types" +import BaseAPI from "./BaseAPI" -export default class DatasourcesAPI { - client: BudibaseInternalAPIClient - +export default class DatasourcesAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { - this.client = client + super(client) } async preview(body: PreviewQueryRequest): Promise<[Response, any]> { - const [response, json] = await this.client.post(`/queries/preview`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/queries/preview`, body) return [response, json] } async save(body: Query): Promise<[Response, any]> { - const [response, json] = await this.client.post(`/queries`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/queries`, body) return [response, json] } async get(queryId: string): Promise<[Response, any]> { - const [response, json] = await this.client.get(`/queries/${queryId}`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/queries/${queryId}`) return [response, json] } } diff --git a/qa-core/src/internal-api/api/apis/RoleAPI.ts b/qa-core/src/internal-api/api/apis/RoleAPI.ts index 4c77a23ca3..370e287382 100644 --- a/qa-core/src/internal-api/api/apis/RoleAPI.ts +++ b/qa-core/src/internal-api/api/apis/RoleAPI.ts @@ -1,23 +1,20 @@ import { Response } from "node-fetch" import { Role, UserRoles } from "@budibase/types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" +import BaseAPI from "./BaseAPI" -export default class RoleAPI { - client: BudibaseInternalAPIClient - +export default class RoleAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { - this.client = client + super(client) } async getRoles(): Promise<[Response, Role[]]> { - const [response, json] = await this.client.get(`/roles`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/roles`) return [response, json] } async createRole(body: Partial): Promise<[Response, UserRoles]> { - const [response, json] = await this.client.post(`/roles`, { body }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/roles`, body) return [response, json] } } diff --git a/qa-core/src/internal-api/api/apis/RowAPI.ts b/qa-core/src/internal-api/api/apis/RowAPI.ts index 6818ae0067..c420aec193 100644 --- a/qa-core/src/internal-api/api/apis/RowAPI.ts +++ b/qa-core/src/internal-api/api/apis/RowAPI.ts @@ -1,29 +1,25 @@ import { Response } from "node-fetch" import { Row } from "@budibase/types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" +import BaseAPI from "./BaseAPI" -export default class RowAPI { +export default class RowAPI extends BaseAPI { rowAdded: boolean - client: BudibaseInternalAPIClient constructor(client: BudibaseInternalAPIClient) { - this.client = client + super(client) this.rowAdded = false } async getAll(tableId: string): Promise<[Response, Row[]]> { - const [response, json] = await this.client.get(`/${tableId}/rows`) + const [response, json] = await this.get(`/${tableId}/rows`) if (this.rowAdded) { - expect(response).toHaveStatusCode(200) expect(json.length).toBeGreaterThanOrEqual(1) } return [response, json] } async add(tableId: string, body: any): Promise<[Response, Row]> { - const [response, json] = await this.client.post(`/${tableId}/rows`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/${tableId}/rows`, body) expect(json._id).toBeDefined() expect(json._rev).toBeDefined() expect(json.tableId).toEqual(tableId) @@ -32,10 +28,7 @@ export default class RowAPI { } async delete(tableId: string, body: any): Promise<[Response, Row[]]> { - const [response, json] = await this.client.del(`/${tableId}/rows/`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.del(`/${tableId}/rows/`, body) return [response, json] } @@ -43,10 +36,7 @@ export default class RowAPI { tableId: string, body: any ): Promise<[Response, Row[]]> { - const [response, json] = await this.client.post(`/${tableId}/search`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/${tableId}/search`, body) expect(json.hasNextPage).toEqual(false) return [response, json.rows] } @@ -55,10 +45,7 @@ export default class RowAPI { tableId: string, body: any ): Promise<[Response, Row[]]> { - const [response, json] = await this.client.post(`/${tableId}/search`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/${tableId}/search`, body) expect(json.hasNextPage).toEqual(true) expect(json.rows.length).toEqual(10) return [response, json.rows] diff --git a/qa-core/src/internal-api/api/apis/ScreenAPI.ts b/qa-core/src/internal-api/api/apis/ScreenAPI.ts index 8d511be263..a5f5859820 100644 --- a/qa-core/src/internal-api/api/apis/ScreenAPI.ts +++ b/qa-core/src/internal-api/api/apis/ScreenAPI.ts @@ -1,27 +1,22 @@ import { Screen } from "@budibase/types" import { Response } from "node-fetch" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" +import BaseAPI from "./BaseAPI" -export default class ScreenAPI { - client: BudibaseInternalAPIClient - +export default class ScreenAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { - this.client = client + super(client) } async create(body: any): Promise<[Response, Screen]> { - const [response, json] = await this.client.post(`/screens`, { body }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/screens`, body) expect(json._id).toBeDefined() expect(json.routing.roleId).toBe(body.routing.roleId) return [response, json] } async delete(screenId: string, rev: string): Promise<[Response, Screen]> { - const [response, json] = await this.client.del( - `/screens/${screenId}/${rev}` - ) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.del(`/screens/${screenId}/${rev}`) return [response, json] } } diff --git a/qa-core/src/internal-api/api/apis/SelfAPI.ts b/qa-core/src/internal-api/api/apis/SelfAPI.ts index a2c1d1fbb8..cd162053a1 100644 --- a/qa-core/src/internal-api/api/apis/SelfAPI.ts +++ b/qa-core/src/internal-api/api/apis/SelfAPI.ts @@ -2,31 +2,27 @@ import { Response } from "node-fetch" import { User } from "@budibase/types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" import { ApiKeyResponse } from "../../../types" +import BaseAPI from "./BaseAPI" -export default class SelfAPI { - client: BudibaseInternalAPIClient - +export default class SelfAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { - this.client = client + super(client) } async getSelf(): Promise<[Response, Partial]> { - const [response, json] = await this.client.get(`/global/self`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/global/self`) return [response, json] } async changeSelfPassword(body: Partial): Promise<[Response, User]> { - const [response, json] = await this.client.post(`/global/self`, { body }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/global/self`, body) expect(json._id).toEqual(body._id) expect(json._rev).not.toEqual(body._rev) return [response, json] } async getApiKey(): Promise { - const [response, json] = await this.client.get(`/global/self/api_key`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/global/self/api_key`) expect(json).toHaveProperty("apiKey") return json } diff --git a/qa-core/src/internal-api/api/apis/TableAPI.ts b/qa-core/src/internal-api/api/apis/TableAPI.ts index 4733301de6..88629381b1 100644 --- a/qa-core/src/internal-api/api/apis/TableAPI.ts +++ b/qa-core/src/internal-api/api/apis/TableAPI.ts @@ -2,31 +2,27 @@ import { Response } from "node-fetch" import { Table } from "@budibase/types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" import { MessageResponse } from "../../../types" +import BaseAPI from "./BaseAPI" -export default class TableAPI { - client: BudibaseInternalAPIClient - +export default class TableAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { - this.client = client + super(client) } async getAll(expectedNumber: Number): Promise<[Response, Table[]]> { - const [response, json] = await this.client.get(`/tables`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/tables`) expect(json.length).toBe(expectedNumber) return [response, json] } async getTableById(id: string): Promise<[Response, Table]> { - const [response, json] = await this.client.get(`/tables/${id}`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/tables/${id}`) expect(json._id).toEqual(id) return [response, json] } async save(body: any, columnAdded?: boolean): Promise<[Response, Table]> { - const [response, json] = await this.client.post(`/tables`, { body }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/tables`, body) expect(json._id).toBeDefined() expect(json._rev).toBeDefined() if (columnAdded) { @@ -37,9 +33,7 @@ export default class TableAPI { } async forbiddenSave(body: any): Promise<[Response, Table]> { - const [response, json] = await this.client.post(`/tables`, { body }) - expect(response).toHaveStatusCode(403) - + const [response, json] = await this.post(`/tables`, body, 403) return [response, json] } @@ -47,8 +41,7 @@ export default class TableAPI { id: string, revId: string ): Promise<[Response, MessageResponse]> { - const [response, json] = await this.client.del(`/tables/${id}/${revId}`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.del(`/tables/${id}/${revId}`) expect(json.message).toEqual(`Table ${id} deleted.`) return [response, json] } diff --git a/qa-core/src/internal-api/api/apis/UserAPI.ts b/qa-core/src/internal-api/api/apis/UserAPI.ts index 44a1283241..7ecb7da622 100644 --- a/qa-core/src/internal-api/api/apis/UserAPI.ts +++ b/qa-core/src/internal-api/api/apis/UserAPI.ts @@ -2,30 +2,29 @@ import { Response } from "node-fetch" import { Role, User, UserDeletedEvent, UserRoles } from "@budibase/types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" import { MessageResponse } from "../../../types" +import BaseAPI from "./BaseAPI" -export default class UserAPI { - client: BudibaseInternalAPIClient - +export default class UserAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { - this.client = client + super(client) } async search(): Promise<[Response, Partial[]]> { - const [response, json] = await this.client.post(`/global/users/search`, {}) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/global/users/search`, {}) + expect(json.data.length).toBeGreaterThan(0) return [response, json] } async getSelf(): Promise<[Response, Partial]> { - const [response, json] = await this.client.get(`/global/self`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/global/self`) + return [response, json] } async getAll(): Promise<[Response, Partial[]]> { - const [response, json] = await this.client.get(`/global/users`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/global/users`) + expect(json.length).toBeGreaterThan(0) return [response, json] } @@ -38,10 +37,8 @@ export default class UserAPI { groups: [], }, } - const [response, json] = await this.client.post(`/global/users/bulk`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/global/users/bulk`, body) + expect(json.created.unsuccessful.length).toEqual(0) expect(json.created.successful.length).toEqual(body.create.users.length) return [response, json] @@ -53,73 +50,58 @@ export default class UserAPI { userIds: [userId], }, } - const [response, json] = await this.client.post(`/global/users/bulk`, { - body, - }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/global/users/bulk`, body) expect(json.deleted.successful.length).toEqual(1) expect(json.deleted.unsuccessful.length).toEqual(0) expect(json.deleted.successful[0].userId).toEqual(userId) return [response, json] } async delete(userId: string): Promise<[Response, UserDeletedEvent]> { - const [response, json] = await this.client.del(`/global/users/${userId}`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.del(`/global/users/${userId}`) expect(json.message).toEqual(`User ${userId} deleted.`) return [response, json] } async invite(body: any): Promise<[Response, MessageResponse]> { - const [response, json] = await this.client.post( - `/global/users/multi/invite`, - { body } - ) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/global/users/multi/invite`, body) expect(json.unsuccessful.length).toEqual(0) expect(json.successful.length).toEqual(body.length) - return [response, json] } async getRoles(): Promise<[Response, Role[]]> { - const [response, json] = await this.client.get(`/roles`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/roles`) return [response, json] } async updateInfo(body: any): Promise<[Response, User]> { - const [response, json] = await this.client.post(`/global/users/`, { body }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/global/users/`, body) expect(json._id).toEqual(body._id) expect(json._rev).not.toEqual(body._rev) return [response, json] } async forcePasswordReset(body: any): Promise<[Response, User]> { - const [response, json] = await this.client.post(`/global/users/`, { body }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/global/users/`, body) expect(json._id).toEqual(body._id) expect(json._rev).not.toEqual(body._rev) return [response, json] } async getInfo(userId: string): Promise<[Response, User]> { - const [response, json] = await this.client.get(`/global/users/${userId}`) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.get(`/global/users/${userId}`) return [response, json] } async changeSelfPassword(body: Partial): Promise<[Response, User]> { - const [response, json] = await this.client.post(`/global/self`, { body }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/global/self`, body) expect(json._id).toEqual(body._id) expect(json._rev).not.toEqual(body._rev) return [response, json] } async createRole(body: Partial): Promise<[Response, UserRoles]> { - const [response, json] = await this.client.post(`/roles`, { body }) - expect(response).toHaveStatusCode(200) + const [response, json] = await this.post(`/roles`, body) return [response, json] } } From 701e06c488fe7211612ccc73253027be782a2737 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Wed, 10 May 2023 16:54:00 +0100 Subject: [PATCH 325/521] package lock update --- qa-core/package-lock.json | 5669 +++++++++++++++++++++++++++++++++++++ 1 file changed, 5669 insertions(+) create mode 100644 qa-core/package-lock.json diff --git a/qa-core/package-lock.json b/qa-core/package-lock.json new file mode 100644 index 0000000000..b37c1062de --- /dev/null +++ b/qa-core/package-lock.json @@ -0,0 +1,5669 @@ +{ + "name": "@budibase/qa-core", + "version": "0.0.1", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@ampproject/remapping": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", + "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "@babel/code-frame": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", + "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "dev": true, + "requires": { + "@babel/highlight": "^7.18.6" + } + }, + "@babel/compat-data": { + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.4.tgz", + "integrity": "sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==", + "dev": true + }, + "@babel/core": { + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.4.tgz", + "integrity": "sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==", + "dev": true, + "requires": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.21.4", + "@babel/generator": "^7.21.4", + "@babel/helper-compilation-targets": "^7.21.4", + "@babel/helper-module-transforms": "^7.21.2", + "@babel/helpers": "^7.21.0", + "@babel/parser": "^7.21.4", + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.21.4", + "@babel/types": "^7.21.4", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.2", + "semver": "^6.3.0" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz", + "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.18.6" + } + }, + "convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + } + } + }, + "@babel/generator": { + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz", + "integrity": "sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==", + "dev": true, + "requires": { + "@babel/types": "^7.21.4", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "dependencies": { + "@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + } + } + }, + "@babel/helper-compilation-targets": { + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz", + "integrity": "sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.21.4", + "@babel/helper-validator-option": "^7.21.0", + "browserslist": "^4.21.3", + "lru-cache": "^5.1.1", + "semver": "^6.3.0" + }, + "dependencies": { + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + } + } + }, + "@babel/helper-environment-visitor": { + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", + "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "dev": true + }, + "@babel/helper-function-name": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", + "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==", + "dev": true, + "requires": { + "@babel/template": "^7.20.7", + "@babel/types": "^7.21.0" + } + }, + "@babel/helper-hoist-variables": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", + "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "dev": true, + "requires": { + "@babel/types": "^7.18.6" + } + }, + "@babel/helper-module-imports": { + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz", + "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==", + "dev": true, + "requires": { + "@babel/types": "^7.21.4" + } + }, + "@babel/helper-module-transforms": { + "version": "7.21.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz", + "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==", + "dev": true, + "requires": { + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-module-imports": "^7.18.6", + "@babel/helper-simple-access": "^7.20.2", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/helper-validator-identifier": "^7.19.1", + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.21.2", + "@babel/types": "^7.21.2" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", + "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", + "dev": true + }, + "@babel/helper-simple-access": { + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", + "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "dev": true, + "requires": { + "@babel/types": "^7.20.2" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", + "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "dev": true, + "requires": { + "@babel/types": "^7.18.6" + } + }, + "@babel/helper-string-parser": { + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", + "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "dev": true + }, + "@babel/helper-validator-identifier": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", + "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "dev": true + }, + "@babel/helper-validator-option": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz", + "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==", + "dev": true + }, + "@babel/helpers": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz", + "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==", + "dev": true, + "requires": { + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.21.0", + "@babel/types": "^7.21.0" + } + }, + "@babel/highlight": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", + "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.18.6", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "@babel/parser": { + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz", + "integrity": "sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==", + "dev": true + }, + "@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.12.13" + } + }, + "@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-jsx": { + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz", + "integrity": "sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.20.2" + } + }, + "@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-syntax-typescript": { + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz", + "integrity": "sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.20.2" + } + }, + "@babel/runtime": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz", + "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==", + "requires": { + "regenerator-runtime": "^0.13.11" + } + }, + "@babel/template": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", + "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7" + } + }, + "@babel/traverse": { + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz", + "integrity": "sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.21.4", + "@babel/generator": "^7.21.4", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.21.0", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.21.4", + "@babel/types": "^7.21.4", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz", + "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.18.6" + } + } + } + }, + "@babel/types": { + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz", + "integrity": "sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-validator-identifier": "^7.19.1", + "to-fast-properties": "^2.0.0" + } + }, + "@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, + "@budibase/backend-core": { + "version": "2.3.17", + "resolved": "https://registry.npmjs.org/@budibase/backend-core/-/backend-core-2.3.17.tgz", + "integrity": "sha512-KcmF2OrNLjLbFtNbYD4ZufnsnwmN2Ez/occgWiecvFRAHOhpkm+Hoy6VggpG1YJBp1DG9kLh3WAZbeYI3QoJbw==", + "requires": { + "@budibase/nano": "10.1.1", + "@budibase/types": "^2.3.17", + "@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", + "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", + "pouchdb-replication-stream": "1.2.9", + "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" + }, + "dependencies": { + "semver": { + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, + "@budibase/nano": { + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/@budibase/nano/-/nano-10.1.1.tgz", + "integrity": "sha512-kbMIzMkjVtl+xI0UPwVU0/pn8/ccxTyfzwBz6Z+ZiN2oUSb0fJCe0qwA6o8dxwSa8nZu4MbGAeMJl3CJndmWtA==", + "requires": { + "@types/tough-cookie": "^4.0.2", + "axios": "^1.1.3", + "http-cookie-agent": "^4.0.2", + "node-abort-controller": "^3.0.1", + "qs": "^6.11.0", + "tough-cookie": "^4.1.2" + } + }, + "@budibase/types": { + "version": "2.3.17", + "resolved": "https://registry.npmjs.org/@budibase/types/-/types-2.3.17.tgz", + "integrity": "sha512-p/6WgwNjVGfwyNLOofhPEG7S3tt5URxAVs+mPXuLn5bsAqRxxJ5XObvw8chijYXmewhGP0hjONQDkmDJ0FkHuA==" + }, + "@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "dependencies": { + "@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + } + } + }, + "@hapi/hoek": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" + }, + "@hapi/topo": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", + "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", + "requires": { + "@hapi/hoek": "^9.0.0" + } + }, + "@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "requires": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + } + }, + "@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true + }, + "@jest/console": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.5.0.tgz", + "integrity": "sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^29.5.0", + "jest-util": "^29.5.0", + "slash": "^3.0.0" + } + }, + "@jest/core": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.5.0.tgz", + "integrity": "sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==", + "dev": true, + "requires": { + "@jest/console": "^29.5.0", + "@jest/reporters": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^29.5.0", + "jest-config": "^29.5.0", + "jest-haste-map": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-regex-util": "^29.4.3", + "jest-resolve": "^29.5.0", + "jest-resolve-dependencies": "^29.5.0", + "jest-runner": "^29.5.0", + "jest-runtime": "^29.5.0", + "jest-snapshot": "^29.5.0", + "jest-util": "^29.5.0", + "jest-validate": "^29.5.0", + "jest-watcher": "^29.5.0", + "micromatch": "^4.0.4", + "pretty-format": "^29.5.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "@jest/environment": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.5.0.tgz", + "integrity": "sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==", + "dev": true, + "requires": { + "@jest/fake-timers": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "jest-mock": "^29.5.0" + } + }, + "@jest/expect": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.5.0.tgz", + "integrity": "sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==", + "dev": true, + "requires": { + "expect": "^29.5.0", + "jest-snapshot": "^29.5.0" + } + }, + "@jest/expect-utils": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.5.0.tgz", + "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==", + "dev": true, + "requires": { + "jest-get-type": "^29.4.3" + } + }, + "@jest/fake-timers": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.5.0.tgz", + "integrity": "sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "@sinonjs/fake-timers": "^10.0.2", + "@types/node": "*", + "jest-message-util": "^29.5.0", + "jest-mock": "^29.5.0", + "jest-util": "^29.5.0" + } + }, + "@jest/globals": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.5.0.tgz", + "integrity": "sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==", + "dev": true, + "requires": { + "@jest/environment": "^29.5.0", + "@jest/expect": "^29.5.0", + "@jest/types": "^29.5.0", + "jest-mock": "^29.5.0" + } + }, + "@jest/reporters": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.5.0.tgz", + "integrity": "sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==", + "dev": true, + "requires": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@jridgewell/trace-mapping": "^0.3.15", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^5.1.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-message-util": "^29.5.0", + "jest-util": "^29.5.0", + "jest-worker": "^29.5.0", + "slash": "^3.0.0", + "string-length": "^4.0.1", + "strip-ansi": "^6.0.0", + "v8-to-istanbul": "^9.0.1" + } + }, + "@jest/schemas": { + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz", + "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==", + "dev": true, + "requires": { + "@sinclair/typebox": "^0.25.16" + } + }, + "@jest/source-map": { + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.4.3.tgz", + "integrity": "sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.15", + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9" + } + }, + "@jest/test-result": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.5.0.tgz", + "integrity": "sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==", + "dev": true, + "requires": { + "@jest/console": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + } + }, + "@jest/test-sequencer": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz", + "integrity": "sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==", + "dev": true, + "requires": { + "@jest/test-result": "^29.5.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.5.0", + "slash": "^3.0.0" + } + }, + "@jest/transform": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.5.0.tgz", + "integrity": "sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==", + "dev": true, + "requires": { + "@babel/core": "^7.11.6", + "@jest/types": "^29.5.0", + "@jridgewell/trace-mapping": "^0.3.15", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.5.0", + "jest-regex-util": "^29.4.3", + "jest-util": "^29.5.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" + } + }, + "@jest/types": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz", + "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==", + "dev": true, + "requires": { + "@jest/schemas": "^29.4.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + } + }, + "@jridgewell/gen-mapping": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", + "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "@jridgewell/resolve-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "dev": true + }, + "@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true + }, + "@jridgewell/sourcemap-codec": { + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "dev": true + }, + "@jridgewell/trace-mapping": { + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", + "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" + } + }, + "@mapbox/node-pre-gyp": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz", + "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==", + "requires": { + "detect-libc": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.7", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + }, + "dependencies": { + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, + "@msgpackr-extract/msgpackr-extract-darwin-arm64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz", + "integrity": "sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==", + "optional": true + }, + "@msgpackr-extract/msgpackr-extract-darwin-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz", + "integrity": "sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==", + "optional": true + }, + "@msgpackr-extract/msgpackr-extract-linux-arm": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz", + "integrity": "sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==", + "optional": true + }, + "@msgpackr-extract/msgpackr-extract-linux-arm64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz", + "integrity": "sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==", + "optional": true + }, + "@msgpackr-extract/msgpackr-extract-linux-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz", + "integrity": "sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==", + "optional": true + }, + "@msgpackr-extract/msgpackr-extract-win32-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz", + "integrity": "sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==", + "optional": true + }, + "@shopify/jest-koa-mocks": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@shopify/jest-koa-mocks/-/jest-koa-mocks-5.0.1.tgz", + "integrity": "sha512-4YskS9q8+TEHNoyopmuoy2XyhInyqeOl7CF5ShJs19sm6m0EA/jGGvgf/osv2PeTfuf42/L2G9CzWUSg49yTSg==", + "requires": { + "koa": "^2.13.4", + "node-mocks-http": "^1.11.0" + } + }, + "@sideway/address": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", + "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", + "requires": { + "@hapi/hoek": "^9.0.0" + } + }, + "@sideway/formula": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz", + "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" + }, + "@sideway/pinpoint": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", + "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" + }, + "@sinclair/typebox": { + "version": "0.25.24", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz", + "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==", + "dev": true + }, + "@sinonjs/commons": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", + "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/fake-timers": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz", + "integrity": "sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^2.0.0" + } + }, + "@techpass/passport-openidconnect": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@techpass/passport-openidconnect/-/passport-openidconnect-0.3.2.tgz", + "integrity": "sha512-fnCtEiexXSHA029B//hJcCJlLJrT3lhpNCyA0rnz58Qttz0BLGCVv6yMT8HmOnGThH6vcDOVwdgKM3kbCQtEhw==", + "requires": { + "base64url": "^3.0.1", + "oauth": "^0.9.15", + "passport-strategy": "^1.0.0", + "request": "^2.88.0", + "webfinger": "^0.4.2" + } + }, + "@tsconfig/node10": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", + "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==", + "dev": true + }, + "@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true + }, + "@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true + }, + "@tsconfig/node16": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz", + "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==", + "dev": true + }, + "@types/babel__core": { + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz", + "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", + "dev": true, + "requires": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "@types/babel__generator": { + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", + "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "dev": true, + "requires": { + "@babel/types": "^7.0.0" + } + }, + "@types/babel__template": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", + "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "dev": true, + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "@types/babel__traverse": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", + "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", + "dev": true, + "requires": { + "@babel/types": "^7.3.0" + } + }, + "@types/graceful-fs": { + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", + "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/istanbul-lib-coverage": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", + "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", + "dev": true + }, + "@types/istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "*" + } + }, + "@types/istanbul-reports": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", + "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/jest": { + "version": "29.0.0", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.0.0.tgz", + "integrity": "sha512-X6Zjz3WO4cT39Gkl0lZ2baFRaEMqJl5NC1OjElkwtNzAlbkr2K/WJXkBkH5VP0zx4Hgsd2TZYdOEfvp2Dxia+Q==", + "dev": true, + "requires": { + "expect": "^29.0.0", + "pretty-format": "^29.0.0" + } + }, + "@types/node": { + "version": "18.15.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.1.tgz", + "integrity": "sha512-U2TWca8AeHSmbpi314QBESRk7oPjSZjDsR+c+H4ECC1l+kFgpZf8Ydhv3SJpPy51VyZHHqxlb6mTTqYNNRVAIw==", + "dev": true + }, + "@types/node-fetch": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.2.tgz", + "integrity": "sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==", + "dev": true, + "requires": { + "@types/node": "*", + "form-data": "^3.0.0" + }, + "dependencies": { + "form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + } + } + }, + "@types/prettier": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", + "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", + "dev": true + }, + "@types/stack-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", + "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", + "dev": true + }, + "@types/tough-cookie": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz", + "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==" + }, + "@types/yargs": { + "version": "17.0.22", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.22.tgz", + "integrity": "sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", + "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", + "dev": true + }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, + "abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "requires": { + "event-target-shim": "^5.0.0" + } + }, + "abstract-leveldown": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz", + "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==", + "requires": { + "buffer": "^5.5.0", + "immediate": "^3.2.3", + "level-concat-iterator": "~2.0.0", + "level-supports": "~1.0.0", + "xtend": "~4.0.0" + }, + "dependencies": { + "buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + } + } + }, + "accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "requires": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + } + }, + "acorn": { + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", + "dev": true + }, + "acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "dev": true + }, + "agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "requires": { + "debug": "4" + } + }, + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "requires": { + "type-fest": "^0.21.3" + } + }, + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" + }, + "are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + } + }, + "arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "argsarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/argsarray/-/argsarray-0.0.1.tgz", + "integrity": "sha512-u96dg2GcAKtpTrBdDoFIM7PjcBA+6rSP0OR94MOReNRyUECL6MtQt5XXmRr4qrftYaef9+l5hcpO5te7sML1Cg==" + }, + "asn1": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", + "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", + "requires": { + "safer-buffer": "~2.1.0" + } + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==" + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "aws-cloudfront-sign": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/aws-cloudfront-sign/-/aws-cloudfront-sign-2.2.0.tgz", + "integrity": "sha512-qG+rwZMP3KRTPPbVmWY8DlrT56AkA4iVOeo23vkdK2EXeW/brJFN2haSNKzVz+oYhFMEIzVVloeAcrEzuRkuVQ==", + "requires": { + "lodash": "^3.6.0" + }, + "dependencies": { + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==" + } + } + }, + "aws-sdk": { + "version": "2.1030.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1030.0.tgz", + "integrity": "sha512-to0STOb8DsSGuSsUb/WCbg/UFnMGfIYavnJH5ZlRCHzvCFjTyR+vfE8ku+qIZvfFM4+5MNTQC/Oxfun2X/TuyA==", + "requires": { + "buffer": "4.9.2", + "events": "1.1.1", + "ieee754": "1.1.13", + "jmespath": "0.15.0", + "querystring": "0.2.0", + "sax": "1.2.1", + "url": "0.10.3", + "uuid": "3.3.2", + "xml2js": "0.4.19" + }, + "dependencies": { + "sax": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", + "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==" + }, + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + }, + "xml2js": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", + "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "requires": { + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" + } + } + } + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==" + }, + "aws4": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", + "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==" + }, + "axios": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz", + "integrity": "sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==", + "requires": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "axios-retry": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-3.4.0.tgz", + "integrity": "sha512-VdgaP+gHH4iQYCCNUWF2pcqeciVOdGrBBAYUfTY+wPcO5Ltvp/37MLFNCmJKo7Gj3SHvCSdL8ouI1qLYJN3liA==", + "requires": { + "@babel/runtime": "^7.15.4", + "is-retry-allowed": "^2.2.0" + } + }, + "babel-jest": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz", + "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==", + "dev": true, + "requires": { + "@jest/transform": "^29.5.0", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^29.5.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + } + }, + "babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + } + }, + "babel-plugin-jest-hoist": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz", + "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==", + "dev": true, + "requires": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.1.14", + "@types/babel__traverse": "^7.0.6" + } + }, + "babel-preset-current-node-syntax": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", + "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", + "dev": true, + "requires": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-import-meta": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-top-level-await": "^7.8.3" + } + }, + "babel-preset-jest": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz", + "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==", + "dev": true, + "requires": { + "babel-plugin-jest-hoist": "^29.5.0", + "babel-preset-current-node-syntax": "^1.0.0" + } + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + }, + "base64url": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz", + "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==" + }, + "bcrypt": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz", + "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==", + "requires": { + "@mapbox/node-pre-gyp": "^1.0.0", + "node-addon-api": "^3.1.0" + } + }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", + "requires": { + "tweetnacl": "^0.14.3" + } + }, + "bcryptjs": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz", + "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==" + }, + "bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "requires": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + }, + "dependencies": { + "buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + } + } + }, + "bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "browserslist": { + "version": "4.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" + } + }, + "bs-logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "dev": true, + "requires": { + "fast-json-stable-stringify": "2.x" + } + }, + "bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, + "requires": { + "node-int64": "^0.4.0" + } + }, + "buffer": { + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", + "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" + } + }, + "buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==" + }, + "buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + }, + "bull": { + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/bull/-/bull-4.10.1.tgz", + "integrity": "sha512-Fp21tRPb2EaZPVfmM+ONZKVz2RA+to+zGgaTLyCKt3JMSU8OOBqK8143OQrnGuGpsyE5G+9FevFAGhdZZfQP2g==", + "requires": { + "cron-parser": "^4.2.1", + "debuglog": "^1.0.0", + "get-port": "^5.1.1", + "ioredis": "^4.28.5", + "lodash": "^4.17.21", + "msgpackr": "^1.5.2", + "p-timeout": "^3.2.0", + "semver": "^7.3.2", + "uuid": "^8.3.0" + }, + "dependencies": { + "ioredis": { + "version": "4.28.5", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.28.5.tgz", + "integrity": "sha512-3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==", + "requires": { + "cluster-key-slot": "^1.1.0", + "debug": "^4.3.1", + "denque": "^1.1.0", + "lodash.defaults": "^4.2.0", + "lodash.flatten": "^4.4.0", + "lodash.isarguments": "^3.1.0", + "p-map": "^2.1.0", + "redis-commands": "1.7.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0", + "standard-as-callback": "^2.1.0" + } + }, + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, + "cache-content-type": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz", + "integrity": "sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==", + "requires": { + "mime-types": "^2.1.18", + "ylru": "^1.2.0" + } + }, + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + }, + "caniuse-lite": { + "version": "1.0.30001474", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001474.tgz", + "integrity": "sha512-iaIZ8gVrWfemh5DG3T9/YqarVZoYf0r188IjaGwx68j4Pf0SGY6CQkmJUIE+NZHkkecQGohzXmBGEwWDr9aM3Q==", + "dev": true + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "chance": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/chance/-/chance-1.1.8.tgz", + "integrity": "sha512-v7fi5Hj2VbR6dJEGRWLmJBA83LJMS47pkAbmROFxHWd9qmE1esHRZW8Clf1Fhzr3rjxnNZVCjOEv/ivFxeIMtg==", + "dev": true + }, + "char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true + }, + "charenc": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", + "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==" + }, + "check-more-types": { + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz", + "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==", + "dev": true + }, + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" + }, + "ci-info": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", + "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", + "dev": true + }, + "cjs-module-lexer": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", + "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "dev": true + }, + "cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + } + }, + "clone-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", + "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==" + }, + "cluster-key-slot": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", + "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==" + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==" + }, + "collect-v8-coverage": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", + "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", + "dev": true + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "component-type": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz", + "integrity": "sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" + }, + "content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "requires": { + "safe-buffer": "5.2.1" + } + }, + "content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" + }, + "convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "cookies": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz", + "integrity": "sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==", + "requires": { + "depd": "~2.0.0", + "keygrip": "~1.1.0" + } + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" + }, + "correlation-id": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/correlation-id/-/correlation-id-4.0.0.tgz", + "integrity": "sha512-WvXtJBlovvOBKqTz/YwWP2gm6CXJZJArfGimp9s/ehmhJMPFbmnPMQe3K60Q9idGNixMvKojMjleyDhZEFdHfg==", + "requires": { + "uuid": "^8.3.1" + } + }, + "create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true + }, + "cron-parser": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.8.1.tgz", + "integrity": "sha512-jbokKWGcyU4gl6jAfX97E1gDpY12DJ1cLJZmoDzaAln/shZ+S3KBFBuA2Q6WeUN4gJf/8klnV1EfvhA2lK5IRQ==", + "requires": { + "luxon": "^3.2.1" + } + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "crypt": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", + "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==" + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "debuglog": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz", + "integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==" + }, + "dedent": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", + "dev": true + }, + "deep-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", + "integrity": "sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==" + }, + "deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true + }, + "deferred-leveldown": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz", + "integrity": "sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==", + "requires": { + "abstract-leveldown": "~6.2.1", + "inherits": "^2.0.3" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" + }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" + }, + "denque": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz", + "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==" + }, + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" + }, + "detect-libc": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", + "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==" + }, + "detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true + }, + "diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true + }, + "diff-sequences": { + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz", + "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==", + "dev": true + }, + "dotenv": { + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz", + "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==" + }, + "double-ended-queue": { + "version": "2.1.0-0", + "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz", + "integrity": "sha512-+BNfZ+deCo8hMNpDqDnvT+c0XpJ5cUa6mqYq89bho2Ifze4URTqRkcwR399hWoTrTkbZ/XJYDgP6rc7pRgffEQ==" + }, + "duplexer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", + "dev": true + }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + }, + "electron-to-chromium": { + "version": "1.4.353", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.353.tgz", + "integrity": "sha512-IdJVpMHJoBT/nn0GQ02wPfbhogDVpd1ud95lP//FTf5l35wzxKJwibB4HBdY7Q+xKPA1nkZ0UDLOMyRj5U5IAQ==", + "dev": true + }, + "emitter-listener": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.1.2.tgz", + "integrity": "sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==", + "requires": { + "shimmer": "^1.2.0" + } + }, + "emittery": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + }, + "encoding-down": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-6.3.0.tgz", + "integrity": "sha512-QKrV0iKR6MZVJV08QY0wp1e7vF6QbhnbQhb07bwpEyuz4uZiZgPlEGdkCROuFkUwdxlFaiPIhjyarH1ee/3vhw==", + "requires": { + "abstract-leveldown": "^6.2.1", + "inherits": "^2.0.3", + "level-codec": "^9.0.0", + "level-errors": "^2.0.0" + } + }, + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "requires": { + "once": "^1.4.0" + } + }, + "end-stream": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/end-stream/-/end-stream-0.1.0.tgz", + "integrity": "sha512-Brl10T8kYnc75IepKizW6Y9liyW8ikz1B7n/xoHrJxoVSSjoqPn30sb7XVFfQERK4QfUMYRGs9dhWwtt2eu6uA==", + "requires": { + "write-stream": "~0.4.3" + } + }, + "errno": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", + "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", + "requires": { + "prr": "~1.0.1" + } + }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, + "event-stream": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", + "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==", + "dev": true, + "requires": { + "duplexer": "~0.1.1", + "from": "~0", + "map-stream": "~0.1.0", + "pause-stream": "0.0.11", + "split": "0.3", + "stream-combiner": "~0.0.4", + "through": "~2.3.1" + } + }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" + }, + "events": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==" + }, + "execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + } + }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "dev": true + }, + "expect": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.5.0.tgz", + "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==", + "dev": true, + "requires": { + "@jest/expect-utils": "^29.5.0", + "jest-get-type": "^29.4.3", + "jest-matcher-utils": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-util": "^29.5.0" + } + }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==" + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "fb-watchman": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, + "requires": { + "bser": "2.1.1" + } + }, + "fetch-cookie": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.11.0.tgz", + "integrity": "sha512-BQm7iZLFhMWFy5CZ/162sAGjBfdNWb7a8LEqqnzsHFhxT/X/SVj/z2t2nu3aJvjlbQkrAlTUApplPRjWyH4mhA==", + "requires": { + "tough-cookie": "^2.3.3 || ^3.0.1 || ^4.0.0" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==" + }, + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" + }, + "from": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", + "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==", + "dev": true + }, + "fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + }, + "fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + } + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "optional": true + }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "requires": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + } + }, + "gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, + "get-intrinsic": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", + "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.3" + } + }, + "get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true + }, + "get-port": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz", + "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==" + }, + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "dev": true + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==" + }, + "har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "requires": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + } + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + }, + "has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "requires": { + "has-symbols": "^1.0.2" + } + }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" + }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "http-assert": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/http-assert/-/http-assert-1.5.0.tgz", + "integrity": "sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==", + "requires": { + "deep-equal": "~1.0.1", + "http-errors": "~1.8.0" + } + }, + "http-cookie-agent": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/http-cookie-agent/-/http-cookie-agent-4.0.2.tgz", + "integrity": "sha512-noTmxdH5CuytTnLj/Qv3Z84e/YFq8yLXAw3pqIYZ25Edhb9pQErIAC+ednw40Cic6Le/h9ryph5/TqsvkOaUCw==", + "requires": { + "agent-base": "^6.0.2" + } + }, + "http-errors": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.1" + }, + "dependencies": { + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==" + } + } + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "requires": { + "agent-base": "6", + "debug": "4" + } + }, + "human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true + }, + "ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + }, + "immediate": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz", + "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==" + }, + "import-local": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", + "dev": true, + "requires": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "ioredis": { + "version": "4.28.0", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.28.0.tgz", + "integrity": "sha512-I+zkeeWp3XFgPT2CtJKxvaF5FjGBGt4yGYljRjQecdQKteThuAsKqffeF1lgHVlYnuNeozRbPOCDNZ7tDWPeig==", + "requires": { + "cluster-key-slot": "^1.1.0", + "debug": "^4.3.1", + "denque": "^1.1.0", + "lodash.defaults": "^4.2.0", + "lodash.flatten": "^4.4.0", + "lodash.isarguments": "^3.1.0", + "p-map": "^2.1.0", + "redis-commands": "1.7.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0", + "standard-as-callback": "^2.1.0" + } + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, + "is-core-module": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", + "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "dev": true + }, + "is-generator-function": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "requires": { + "has-tostringtag": "^1.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "is-retry-allowed": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz", + "integrity": "sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==" + }, + "is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==" + }, + "istanbul-lib-coverage": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", + "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", + "dev": true + }, + "istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "requires": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + } + }, + "istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + } + }, + "istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + } + }, + "istanbul-reports": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", + "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", + "dev": true, + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } + }, + "jest": { + "version": "29.0.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.0.0.tgz", + "integrity": "sha512-9uz4Tclskb8WrfRXqu66FsFCFoyYctwWXpruKwnD95FZqkyoEAA1oGH53HUn7nQx7uEgZTKdNl/Yo6DqqU+XMg==", + "dev": true, + "requires": { + "@jest/core": "^29.0.0", + "@jest/types": "^29.0.0", + "import-local": "^3.0.2", + "jest-cli": "^29.0.0" + }, + "dependencies": { + "jest-cli": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.5.0.tgz", + "integrity": "sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==", + "dev": true, + "requires": { + "@jest/core": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/types": "^29.5.0", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "import-local": "^3.0.2", + "jest-config": "^29.5.0", + "jest-util": "^29.5.0", + "jest-validate": "^29.5.0", + "prompts": "^2.0.1", + "yargs": "^17.3.1" + } + } + } + }, + "jest-changed-files": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz", + "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==", + "dev": true, + "requires": { + "execa": "^5.0.0", + "p-limit": "^3.1.0" + }, + "dependencies": { + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + } + } + }, + "jest-circus": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.5.0.tgz", + "integrity": "sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==", + "dev": true, + "requires": { + "@jest/environment": "^29.5.0", + "@jest/expect": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^0.7.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^29.5.0", + "jest-matcher-utils": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-runtime": "^29.5.0", + "jest-snapshot": "^29.5.0", + "jest-util": "^29.5.0", + "p-limit": "^3.1.0", + "pretty-format": "^29.5.0", + "pure-rand": "^6.0.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "dependencies": { + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + } + } + }, + "jest-config": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.5.0.tgz", + "integrity": "sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==", + "dev": true, + "requires": { + "@babel/core": "^7.11.6", + "@jest/test-sequencer": "^29.5.0", + "@jest/types": "^29.5.0", + "babel-jest": "^29.5.0", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-circus": "^29.5.0", + "jest-environment-node": "^29.5.0", + "jest-get-type": "^29.4.3", + "jest-regex-util": "^29.4.3", + "jest-resolve": "^29.5.0", + "jest-runner": "^29.5.0", + "jest-util": "^29.5.0", + "jest-validate": "^29.5.0", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^29.5.0", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + } + }, + "jest-diff": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.5.0.tgz", + "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "diff-sequences": "^29.4.3", + "jest-get-type": "^29.4.3", + "pretty-format": "^29.5.0" + } + }, + "jest-docblock": { + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz", + "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==", + "dev": true, + "requires": { + "detect-newline": "^3.0.0" + } + }, + "jest-each": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.5.0.tgz", + "integrity": "sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.4.3", + "jest-util": "^29.5.0", + "pretty-format": "^29.5.0" + } + }, + "jest-environment-node": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.5.0.tgz", + "integrity": "sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==", + "dev": true, + "requires": { + "@jest/environment": "^29.5.0", + "@jest/fake-timers": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "jest-mock": "^29.5.0", + "jest-util": "^29.5.0" + } + }, + "jest-get-type": { + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz", + "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==", + "dev": true + }, + "jest-haste-map": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.5.0.tgz", + "integrity": "sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "fsevents": "^2.3.2", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.4.3", + "jest-util": "^29.5.0", + "jest-worker": "^29.5.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + } + }, + "jest-leak-detector": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz", + "integrity": "sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==", + "dev": true, + "requires": { + "jest-get-type": "^29.4.3", + "pretty-format": "^29.5.0" + } + }, + "jest-matcher-utils": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz", + "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "jest-diff": "^29.5.0", + "jest-get-type": "^29.4.3", + "pretty-format": "^29.5.0" + } + }, + "jest-message-util": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.5.0.tgz", + "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.5.0", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.5.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + } + }, + "jest-mock": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.5.0.tgz", + "integrity": "sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "@types/node": "*", + "jest-util": "^29.5.0" + } + }, + "jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "dev": true + }, + "jest-regex-util": { + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz", + "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==", + "dev": true + }, + "jest-resolve": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.5.0.tgz", + "integrity": "sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.5.0", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^29.5.0", + "jest-validate": "^29.5.0", + "resolve": "^1.20.0", + "resolve.exports": "^2.0.0", + "slash": "^3.0.0" + } + }, + "jest-resolve-dependencies": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz", + "integrity": "sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==", + "dev": true, + "requires": { + "jest-regex-util": "^29.4.3", + "jest-snapshot": "^29.5.0" + } + }, + "jest-runner": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.5.0.tgz", + "integrity": "sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==", + "dev": true, + "requires": { + "@jest/console": "^29.5.0", + "@jest/environment": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^29.4.3", + "jest-environment-node": "^29.5.0", + "jest-haste-map": "^29.5.0", + "jest-leak-detector": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-resolve": "^29.5.0", + "jest-runtime": "^29.5.0", + "jest-util": "^29.5.0", + "jest-watcher": "^29.5.0", + "jest-worker": "^29.5.0", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" + }, + "dependencies": { + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + } + } + }, + "jest-runtime": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.5.0.tgz", + "integrity": "sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==", + "dev": true, + "requires": { + "@jest/environment": "^29.5.0", + "@jest/fake-timers": "^29.5.0", + "@jest/globals": "^29.5.0", + "@jest/source-map": "^29.4.3", + "@jest/test-result": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-mock": "^29.5.0", + "jest-regex-util": "^29.4.3", + "jest-resolve": "^29.5.0", + "jest-snapshot": "^29.5.0", + "jest-util": "^29.5.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" + } + }, + "jest-snapshot": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.5.0.tgz", + "integrity": "sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==", + "dev": true, + "requires": { + "@babel/core": "^7.11.6", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/traverse": "^7.7.2", + "@babel/types": "^7.3.3", + "@jest/expect-utils": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/babel__traverse": "^7.0.6", + "@types/prettier": "^2.1.5", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^29.5.0", + "graceful-fs": "^4.2.9", + "jest-diff": "^29.5.0", + "jest-get-type": "^29.4.3", + "jest-matcher-utils": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-util": "^29.5.0", + "natural-compare": "^1.4.0", + "pretty-format": "^29.5.0", + "semver": "^7.3.5" + }, + "dependencies": { + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, + "jest-util": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz", + "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + } + }, + "jest-validate": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.5.0.tgz", + "integrity": "sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.4.3", + "leven": "^3.1.0", + "pretty-format": "^29.5.0" + }, + "dependencies": { + "camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true + } + } + }, + "jest-watcher": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.5.0.tgz", + "integrity": "sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==", + "dev": true, + "requires": { + "@jest/test-result": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "jest-util": "^29.5.0", + "string-length": "^4.0.1" + } + }, + "jest-worker": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz", + "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==", + "dev": true, + "requires": { + "@types/node": "*", + "jest-util": "^29.5.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "dependencies": { + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jmespath": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz", + "integrity": "sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w==" + }, + "joi": { + "version": "17.6.0", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.6.0.tgz", + "integrity": "sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw==", + "requires": { + "@hapi/hoek": "^9.0.0", + "@hapi/topo": "^5.0.0", + "@sideway/address": "^4.1.3", + "@sideway/formula": "^3.0.0", + "@sideway/pinpoint": "^2.0.0" + } + }, + "join-component": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz", + "integrity": "sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==" + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==" + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, + "json-schema": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" + }, + "json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true + }, + "jsonwebtoken": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz", + "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==", + "requires": { + "jws": "^3.2.2", + "lodash": "^4.17.21", + "ms": "^2.1.1", + "semver": "^7.3.8" + }, + "dependencies": { + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, + "jsprim": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.4.0", + "verror": "1.10.0" + } + }, + "jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "requires": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, + "keygrip": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz", + "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==", + "requires": { + "tsscmp": "1.0.6" + } + }, + "kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true + }, + "koa": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/koa/-/koa-2.14.1.tgz", + "integrity": "sha512-USJFyZgi2l0wDgqkfD27gL4YGno7TfUkcmOe6UOLFOVuN+J7FwnNu4Dydl4CUQzraM1lBAiGed0M9OVJoT0Kqw==", + "requires": { + "accepts": "^1.3.5", + "cache-content-type": "^1.0.0", + "content-disposition": "~0.5.2", + "content-type": "^1.0.4", + "cookies": "~0.8.0", + "debug": "^4.3.2", + "delegates": "^1.0.0", + "depd": "^2.0.0", + "destroy": "^1.0.4", + "encodeurl": "^1.0.2", + "escape-html": "^1.0.3", + "fresh": "~0.5.2", + "http-assert": "^1.3.0", + "http-errors": "^1.6.3", + "is-generator-function": "^1.0.7", + "koa-compose": "^4.1.0", + "koa-convert": "^2.0.0", + "on-finished": "^2.3.0", + "only": "~0.0.2", + "parseurl": "^1.3.2", + "statuses": "^1.5.0", + "type-is": "^1.6.16", + "vary": "^1.1.2" + } + }, + "koa-compose": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz", + "integrity": "sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==" + }, + "koa-convert": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/koa-convert/-/koa-convert-2.0.0.tgz", + "integrity": "sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA==", + "requires": { + "co": "^4.6.0", + "koa-compose": "^4.1.0" + } + }, + "koa-passport": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/koa-passport/-/koa-passport-4.1.4.tgz", + "integrity": "sha512-dJBCkl4X+zdYxbI2V2OtoGy0PUenpvp2ZLLWObc8UJhsId0iQpTFT8RVcuA0709AL2txGwRHnSPoT1bYNGa6Kg==", + "requires": { + "passport": "^0.4.0" + } + }, + "lazy-ass": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", + "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==", + "dev": true + }, + "level": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/level/-/level-6.0.1.tgz", + "integrity": "sha512-psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw==", + "requires": { + "level-js": "^5.0.0", + "level-packager": "^5.1.0", + "leveldown": "^5.4.0" + } + }, + "level-codec": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz", + "integrity": "sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ==", + "requires": { + "buffer": "^5.6.0" + }, + "dependencies": { + "buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + } + } + }, + "level-concat-iterator": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz", + "integrity": "sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw==" + }, + "level-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz", + "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==", + "requires": { + "errno": "~0.1.1" + } + }, + "level-iterator-stream": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz", + "integrity": "sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==", + "requires": { + "inherits": "^2.0.4", + "readable-stream": "^3.4.0", + "xtend": "^4.0.2" + } + }, + "level-js": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/level-js/-/level-js-5.0.2.tgz", + "integrity": "sha512-SnBIDo2pdO5VXh02ZmtAyPP6/+6YTJg2ibLtl9C34pWvmtMEmRTWpra+qO/hifkUtBTOtfx6S9vLDjBsBK4gRg==", + "requires": { + "abstract-leveldown": "~6.2.3", + "buffer": "^5.5.0", + "inherits": "^2.0.3", + "ltgt": "^2.1.2" + }, + "dependencies": { + "buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + } + } + }, + "level-packager": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-5.1.1.tgz", + "integrity": "sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ==", + "requires": { + "encoding-down": "^6.3.0", + "levelup": "^4.3.2" + } + }, + "level-supports": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/level-supports/-/level-supports-1.0.1.tgz", + "integrity": "sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==", + "requires": { + "xtend": "^4.0.2" + } + }, + "level-write-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/level-write-stream/-/level-write-stream-1.0.0.tgz", + "integrity": "sha512-bBNKOEOMl8msO+uIM9YX/gUO6ckokZ/4pCwTm/lwvs46x6Xs8Zy0sn3Vh37eDqse4mhy4fOMIb/JsSM2nyQFtw==", + "requires": { + "end-stream": "~0.1.0" + } + }, + "leveldown": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-5.6.0.tgz", + "integrity": "sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ==", + "requires": { + "abstract-leveldown": "~6.2.1", + "napi-macros": "~2.0.0", + "node-gyp-build": "~4.1.0" + } + }, + "levelup": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz", + "integrity": "sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==", + "requires": { + "deferred-leveldown": "~5.3.0", + "level-errors": "~2.0.0", + "level-iterator-stream": "~4.0.0", + "level-supports": "~1.0.0", + "xtend": "~4.0.0" + } + }, + "leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true + }, + "lie": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", + "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==", + "requires": { + "immediate": "~3.0.5" + }, + "dependencies": { + "immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" + } + } + }, + "lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==" + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==" + }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" + }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==" + }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, + "lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "dev": true + }, + "lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" + }, + "lodash.pick": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", + "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==" + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "ltgt": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz", + "integrity": "sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA==" + }, + "luxon": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", + "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==" + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "requires": { + "semver": "^6.0.0" + } + }, + "make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "makeerror": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "dev": true, + "requires": { + "tmpl": "1.0.5" + } + }, + "map-stream": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", + "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==", + "dev": true + }, + "md5": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", + "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==", + "requires": { + "charenc": "0.0.2", + "crypt": "0.0.2", + "is-buffer": "~1.1.6" + } + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" + }, + "micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "requires": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + } + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, + "mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" + }, + "mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "requires": { + "mime-db": "1.52.0" + } + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" + }, + "minipass": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", + "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==" + }, + "minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "requires": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + } + } + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, + "mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "msgpackr": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.5.tgz", + "integrity": "sha512-mpPs3qqTug6ahbblkThoUY2DQdNXcm4IapwOS3Vm/87vmpzLVelvp9h3It1y9l1VPpiFLV11vfOXnmeEwiIXwg==", + "requires": { + "msgpackr-extract": "^3.0.1" + } + }, + "msgpackr-extract": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz", + "integrity": "sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==", + "optional": true, + "requires": { + "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.2", + "node-gyp-build-optional-packages": "5.0.7" + } + }, + "napi-macros": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/napi-macros/-/napi-macros-2.0.0.tgz", + "integrity": "sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg==" + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "ndjson": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz", + "integrity": "sha512-hUPLuaziboGjNF7wHngkgVc0FOclR8dDk/HfEvTtDr/iUrqBWiRcRSTK3/nLOqKH33th714BrMmTPtObI9gZxQ==", + "requires": { + "json-stringify-safe": "^5.0.1", + "minimist": "^1.2.0", + "split2": "^2.1.0", + "through2": "^2.0.3" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + } + } + }, + "negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" + }, + "node-abort-controller": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz", + "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==" + }, + "node-addon-api": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" + }, + "node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } + }, + "node-gyp-build": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz", + "integrity": "sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==" + }, + "node-gyp-build-optional-packages": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz", + "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==", + "optional": true + }, + "node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true + }, + "node-mocks-http": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/node-mocks-http/-/node-mocks-http-1.12.2.tgz", + "integrity": "sha512-xhWwC0dh35R9rf0j3bRZXuISXdHxxtMx0ywZQBwjrg3yl7KpRETzogfeCamUIjltpn0Fxvs/ZhGJul1vPLrdJQ==", + "requires": { + "accepts": "^1.3.7", + "content-disposition": "^0.5.3", + "depd": "^1.1.0", + "fresh": "^0.5.2", + "merge-descriptors": "^1.0.1", + "methods": "^1.1.2", + "mime": "^1.3.4", + "parseurl": "^1.3.3", + "range-parser": "^1.2.0", + "type-is": "^1.6.18" + }, + "dependencies": { + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==" + } + } + }, + "node-releases": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", + "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", + "dev": true + }, + "nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "requires": { + "abbrev": "1" + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "requires": { + "path-key": "^3.0.0" + } + }, + "npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "requires": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + } + }, + "oauth": { + "version": "0.9.15", + "resolved": "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz", + "integrity": "sha512-a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==" + }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + }, + "object-inspect": { + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==" + }, + "on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "requires": { + "ee-first": "1.1.1" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "requires": { + "wrappy": "1" + } + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "only": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/only/-/only-0.0.2.tgz", + "integrity": "sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ==" + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==" + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-map": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", + "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==" + }, + "p-timeout": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", + "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", + "requires": { + "p-finally": "^1.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + } + }, + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + }, + "passport": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz", + "integrity": "sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==", + "requires": { + "passport-strategy": "1.x.x", + "pause": "0.0.1" + } + }, + "passport-google-oauth": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-2.0.0.tgz", + "integrity": "sha512-JKxZpBx6wBQXX1/a1s7VmdBgwOugohH+IxCy84aPTZNq/iIPX6u7Mqov1zY7MKRz3niFPol0KJz8zPLBoHKtYA==", + "requires": { + "passport-google-oauth1": "1.x.x", + "passport-google-oauth20": "2.x.x" + } + }, + "passport-google-oauth1": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz", + "integrity": "sha512-qpCEhuflJgYrdg5zZIpAq/K3gTqa1CtHjbubsEsidIdpBPLkEVq6tB1I8kBNcH89RdSiYbnKpCBXAZXX/dtx1Q==", + "requires": { + "passport-oauth1": "1.x.x" + } + }, + "passport-google-oauth20": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz", + "integrity": "sha512-KSk6IJ15RoxuGq7D1UKK/8qKhNfzbLeLrG3gkLZ7p4A6DBCcv7xpyQwuXtWdpyR0+E0mwkpjY1VfPOhxQrKzdQ==", + "requires": { + "passport-oauth2": "1.x.x" + } + }, + "passport-jwt": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.0.tgz", + "integrity": "sha512-BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg==", + "requires": { + "jsonwebtoken": "^8.2.0", + "passport-strategy": "^1.0.0" + }, + "dependencies": { + "jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "requires": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, + "passport-local": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz", + "integrity": "sha512-9wCE6qKznvf9mQYYbgJ3sVOHmCWoUNMVFoZzNoznmISbhnNNPhN9xfY3sLmScHMetEJeoY7CXwfhCe7argfQow==", + "requires": { + "passport-strategy": "1.x.x" + } + }, + "passport-oauth1": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.3.0.tgz", + "integrity": "sha512-8T/nX4gwKTw0PjxP1xfD0QhrydQNakzeOpZ6M5Uqdgz9/a/Ag62RmJxnZQ4LkbdXGrRehQHIAHNAu11rCP46Sw==", + "requires": { + "oauth": "0.9.x", + "passport-strategy": "1.x.x", + "utils-merge": "1.x.x" + } + }, + "passport-oauth2": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.7.0.tgz", + "integrity": "sha512-j2gf34szdTF2Onw3+76alNnaAExlUmHvkc7cL+cmaS5NzHzDP/BvFHJruueQ9XAeNOdpI+CH+PWid8RA7KCwAQ==", + "requires": { + "base64url": "3.x.x", + "oauth": "0.9.x", + "passport-strategy": "1.x.x", + "uid2": "0.0.x", + "utils-merge": "1.x.x" + } + }, + "passport-oauth2-refresh": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz", + "integrity": "sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A==" + }, + "passport-strategy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", + "integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==" + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "pause": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz", + "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==" + }, + "pause-stream": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", + "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==", + "dev": true, + "requires": { + "through": "~2.3" + } + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" + }, + "picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true + }, + "pirates": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", + "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + } + }, + "posthog-node": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-1.3.0.tgz", + "integrity": "sha512-2+VhqiY/rKIqKIXyvemBFHbeijHE25sP7eKltnqcFqAssUE6+sX6vusN9A4luzToOqHQkUZexiCKxvuGagh7JA==", + "requires": { + "axios": "0.24.0", + "axios-retry": "^3.1.9", + "component-type": "^1.2.1", + "join-component": "^1.1.0", + "md5": "^2.3.0", + "ms": "^2.1.3", + "remove-trailing-slash": "^0.1.1", + "uuid": "^8.3.2" + }, + "dependencies": { + "axios": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", + "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", + "requires": { + "follow-redirects": "^1.14.4" + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + } + } + }, + "pouch-stream": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/pouch-stream/-/pouch-stream-0.4.1.tgz", + "integrity": "sha512-RAWFhsGDbG4xZQpvrrQlhrITVUNVCKmglfe5WWDnJaDf1u9DMaRLHv//m65tBZevuo4QTGjwcyggwYxd7AGLsg==", + "requires": { + "inherits": "^2.0.1", + "readable-stream": "^1.0.27-1" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==" + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==" + } + } + }, + "pouchdb": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/pouchdb/-/pouchdb-7.3.0.tgz", + "integrity": "sha512-OwsIQGXsfx3TrU1pLruj6PGSwFH+h5k4hGNxFkZ76Um7/ZI8F5TzUHFrpldVVIhfXYi2vP31q0q7ot1FSLFYOw==", + "requires": { + "abort-controller": "3.0.0", + "argsarray": "0.0.1", + "buffer-from": "1.1.2", + "clone-buffer": "1.0.0", + "double-ended-queue": "2.1.0-0", + "fetch-cookie": "0.11.0", + "immediate": "3.3.0", + "inherits": "2.0.4", + "level": "6.0.1", + "level-codec": "9.0.2", + "level-write-stream": "1.0.0", + "leveldown": "5.6.0", + "levelup": "4.4.0", + "ltgt": "2.2.1", + "node-fetch": "2.6.7", + "readable-stream": "1.1.14", + "spark-md5": "3.0.2", + "through2": "3.0.2", + "uuid": "8.3.2", + "vuvuzela": "1.0.3" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==" + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==" + } + } + }, + "pouchdb-abstract-mapreduce": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.2.2.tgz", + "integrity": "sha512-7HWN/2yV2JkwMnGnlp84lGvFtnm0Q55NiBUdbBcaT810+clCGKvhssBCrXnmwShD1SXTwT83aszsgiSfW+SnBA==", + "requires": { + "pouchdb-binary-utils": "7.2.2", + "pouchdb-collate": "7.2.2", + "pouchdb-collections": "7.2.2", + "pouchdb-errors": "7.2.2", + "pouchdb-fetch": "7.2.2", + "pouchdb-mapreduce-utils": "7.2.2", + "pouchdb-md5": "7.2.2", + "pouchdb-utils": "7.2.2" + } + }, + "pouchdb-binary-utils": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/pouchdb-binary-utils/-/pouchdb-binary-utils-7.2.2.tgz", + "integrity": "sha512-shacxlmyHbUrNfE6FGYpfyAJx7Q0m91lDdEAaPoKZM3SzAmbtB1i+OaDNtYFztXjJl16yeudkDb3xOeokVL3Qw==", + "requires": { + "buffer-from": "1.1.1" + }, + "dependencies": { + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" + } + } + }, + "pouchdb-collate": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/pouchdb-collate/-/pouchdb-collate-7.2.2.tgz", + "integrity": "sha512-/SMY9GGasslknivWlCVwXMRMnQ8myKHs4WryQ5535nq1Wj/ehpqWloMwxEQGvZE1Sda3LOm7/5HwLTcB8Our+w==" + }, + "pouchdb-collections": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-7.2.2.tgz", + "integrity": "sha512-6O9zyAYlp3UdtfneiMYuOCWdUCQNo2bgdjvNsMSacQX+3g8WvIoFQCYJjZZCpTttQGb+MHeRMr8m2U95lhJTew==" + }, + "pouchdb-errors": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/pouchdb-errors/-/pouchdb-errors-7.2.2.tgz", + "integrity": "sha512-6GQsiWc+7uPfgEHeavG+7wuzH3JZW29Dnrvz8eVbDFE50kVFxNDVm3EkYHskvo5isG7/IkOx7PV7RPTA3keG3g==", + "requires": { + "inherits": "2.0.4" + } + }, + "pouchdb-fetch": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/pouchdb-fetch/-/pouchdb-fetch-7.2.2.tgz", + "integrity": "sha512-lUHmaG6U3zjdMkh8Vob9GvEiRGwJfXKE02aZfjiVQgew+9SLkuOxNw3y2q4d1B6mBd273y1k2Lm0IAziRNxQnA==", + "requires": { + "abort-controller": "3.0.0", + "fetch-cookie": "0.10.1", + "node-fetch": "2.6.0" + }, + "dependencies": { + "fetch-cookie": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.10.1.tgz", + "integrity": "sha512-beB+VEd4cNeVG1PY+ee74+PkuCQnik78pgLi5Ah/7qdUfov8IctU0vLUbBT8/10Ma5GMBeI4wtxhGrEfKNYs2g==", + "requires": { + "tough-cookie": "^2.3.3 || ^3.0.1 || ^4.0.0" + } + }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + } + } + }, + "pouchdb-find": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/pouchdb-find/-/pouchdb-find-7.2.2.tgz", + "integrity": "sha512-BmFeFVQ0kHmDehvJxNZl9OmIztCjPlZlVSdpijuFbk/Fi1EFPU1BAv3kLC+6DhZuOqU/BCoaUBY9sn66pPY2ag==", + "requires": { + "pouchdb-abstract-mapreduce": "7.2.2", + "pouchdb-collate": "7.2.2", + "pouchdb-errors": "7.2.2", + "pouchdb-fetch": "7.2.2", + "pouchdb-md5": "7.2.2", + "pouchdb-selector-core": "7.2.2", + "pouchdb-utils": "7.2.2" + } + }, + "pouchdb-mapreduce-utils": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.2.2.tgz", + "integrity": "sha512-rAllb73hIkU8rU2LJNbzlcj91KuulpwQu804/F6xF3fhZKC/4JQMClahk+N/+VATkpmLxp1zWmvmgdlwVU4HtQ==", + "requires": { + "argsarray": "0.0.1", + "inherits": "2.0.4", + "pouchdb-collections": "7.2.2", + "pouchdb-utils": "7.2.2" + } + }, + "pouchdb-md5": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/pouchdb-md5/-/pouchdb-md5-7.2.2.tgz", + "integrity": "sha512-c/RvLp2oSh8PLAWU5vFBnp6ejJABIdKqboZwRRUrWcfGDf+oyX8RgmJFlYlzMMOh4XQLUT1IoaDV8cwlsuryZw==", + "requires": { + "pouchdb-binary-utils": "7.2.2", + "spark-md5": "3.0.1" + }, + "dependencies": { + "spark-md5": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.1.tgz", + "integrity": "sha512-0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig==" + } + } + }, + "pouchdb-promise": { + "version": "6.4.3", + "resolved": "https://registry.npmjs.org/pouchdb-promise/-/pouchdb-promise-6.4.3.tgz", + "integrity": "sha512-ruJaSFXwzsxRHQfwNHjQfsj58LBOY1RzGzde4PM5CWINZwFjCQAhZwfMrch2o/0oZT6d+Xtt0HTWhq35p3b0qw==", + "requires": { + "lie": "3.1.1" + } + }, + "pouchdb-replication-stream": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/pouchdb-replication-stream/-/pouchdb-replication-stream-1.2.9.tgz", + "integrity": "sha512-hM8XRBfamTTUwRhKwLS/jSNouBhn9R/4ugdHNRD1EvJzwV8iImh6sDYbCU9PGuznjyOjXz6vpFRzKeI2KYfwnQ==", + "requires": { + "argsarray": "0.0.1", + "inherits": "^2.0.3", + "lodash.pick": "^4.0.0", + "ndjson": "^1.4.3", + "pouch-stream": "^0.4.0", + "pouchdb-promise": "^6.0.4", + "through2": "^2.0.0" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + } + } + }, + "pouchdb-selector-core": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/pouchdb-selector-core/-/pouchdb-selector-core-7.2.2.tgz", + "integrity": "sha512-XYKCNv9oiNmSXV5+CgR9pkEkTFqxQGWplnVhO3W9P154H08lU0ZoNH02+uf+NjZ2kjse7Q1fxV4r401LEcGMMg==", + "requires": { + "pouchdb-collate": "7.2.2", + "pouchdb-utils": "7.2.2" + } + }, + "pouchdb-utils": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/pouchdb-utils/-/pouchdb-utils-7.2.2.tgz", + "integrity": "sha512-XmeM5ioB4KCfyB2MGZXu1Bb2xkElNwF1qG+zVFbQsKQij0zvepdOUfGuWvLRHxTOmt4muIuSOmWZObZa3NOgzQ==", + "requires": { + "argsarray": "0.0.1", + "clone-buffer": "1.0.0", + "immediate": "3.3.0", + "inherits": "2.0.4", + "pouchdb-collections": "7.2.2", + "pouchdb-errors": "7.2.2", + "pouchdb-md5": "7.2.2", + "uuid": "8.1.0" + }, + "dependencies": { + "uuid": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz", + "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==" + } + } + }, + "prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "dev": true + }, + "pretty-format": { + "version": "29.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz", + "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==", + "dev": true, + "requires": { + "@jest/schemas": "^29.4.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true + } + } + }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "requires": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + } + }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, + "prr": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", + "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==" + }, + "ps-tree": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz", + "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==", + "dev": true, + "requires": { + "event-stream": "=3.3.4" + } + }, + "psl": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==" + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "punycode": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==" + }, + "pure-rand": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.1.tgz", + "integrity": "sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==", + "dev": true + }, + "qs": { + "version": "6.11.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz", + "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==", + "requires": { + "side-channel": "^1.0.4" + } + }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==" + }, + "querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" + }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + }, + "react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "redis-commands": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz", + "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==" + }, + "redis-errors": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", + "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==" + }, + "redis-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", + "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==", + "requires": { + "redis-errors": "^1.0.0" + } + }, + "redlock": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/redlock/-/redlock-4.2.0.tgz", + "integrity": "sha512-j+oQlG+dOwcetUt2WJWttu4CZVeRzUrcVcISFmEmfyuwCVSJ93rDT7YSgg7H7rnxwoRyk/jU46kycVka5tW7jA==", + "requires": { + "bluebird": "^3.7.2" + } + }, + "regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + }, + "remove-trailing-slash": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz", + "integrity": "sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==" + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "dependencies": { + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "qs": { + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", + "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==" + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + } + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true + }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==" + }, + "resolve": { + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", + "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", + "dev": true, + "requires": { + "is-core-module": "^2.11.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + } + }, + "resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "requires": { + "resolve-from": "^5.0.0" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + }, + "resolve.exports": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", + "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", + "dev": true + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + }, + "rxjs": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", + "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", + "dev": true, + "requires": { + "tslib": "^2.1.0" + } + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "sanitize-s3-objectkey": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz", + "integrity": "sha512-ZTk7aqLxy4sD40GWcYWoLfbe05XLmkKvh6vGKe13ADlei24xlezcvjgKy1qRArlaIbIMYaqK7PCalvZtulZlaQ==" + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" + }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "shimmer": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz", + "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==" + }, + "side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "requires": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + } + }, + "signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + }, + "sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "spark-md5": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.2.tgz", + "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==" + }, + "split": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", + "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==", + "dev": true, + "requires": { + "through": "2" + } + }, + "split2": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz", + "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", + "requires": { + "through2": "^2.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + } + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "sshpk": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", + "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + } + }, + "stack-utils": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dev": true, + "requires": { + "escape-string-regexp": "^2.0.0" + }, + "dependencies": { + "escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true + } + } + }, + "standard-as-callback": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", + "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==" + }, + "start-server-and-test": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.14.0.tgz", + "integrity": "sha512-on5ELuxO2K0t8EmNj9MtVlFqwBMxfWOhu4U7uZD1xccVpFlOQKR93CSe0u98iQzfNxRyaNTb/CdadbNllplTsw==", + "dev": true, + "requires": { + "bluebird": "3.7.2", + "check-more-types": "2.24.0", + "debug": "4.3.2", + "execa": "5.1.1", + "lazy-ass": "1.6.0", + "ps-tree": "1.2.0", + "wait-on": "6.0.0" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + } + } + }, + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==" + }, + "step": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/step/-/step-0.0.6.tgz", + "integrity": "sha512-qSSeQinUJk2w38vUFobjFoE307GqsozMC8VisOCkJLpklvKPT0ptPHwWOrENoag8rgLudvTkfP3bancwP93/Jw==" + }, + "stream-combiner": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", + "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==", + "dev": true, + "requires": { + "duplexer": "~0.1.1" + } + }, + "string-length": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dev": true, + "requires": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + } + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "requires": { + "safe-buffer": "~5.2.0" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + } + }, + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true + }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true + }, + "tar": { + "version": "6.1.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", + "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "requires": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^4.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + } + }, + "tar-fs": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "requires": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + }, + "dependencies": { + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + } + } + }, + "tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "requires": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + } + }, + "test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + } + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true + }, + "through2": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", + "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", + "requires": { + "inherits": "^2.0.4", + "readable-stream": "2 || 3" + } + }, + "timekeeper": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/timekeeper/-/timekeeper-2.2.0.tgz", + "integrity": "sha512-W3AmPTJWZkRwu+iSNxPIsLZ2ByADsOLbbLxe46UJyWj3mlYLlwucKiq+/dPm0l9wTzqoF3/2PH0AGFCebjq23A==", + "dev": true + }, + "tmpl": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true + }, + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" + }, + "tough-cookie": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", + "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", + "requires": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + } + }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "ts-jest": { + "version": "29.0.0", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.0.0.tgz", + "integrity": "sha512-OxUaigbv5Aon3OMLY9HBtwkGMs1upWE/URrmmVQFzzOcGlEPVuWzGmXUIkWGt/95Dj/T6MGuTrHHGL6kT6Yn8g==", + "dev": true, + "requires": { + "bs-logger": "0.x", + "fast-json-stable-stringify": "2.x", + "jest-util": "^29.0.0", + "json5": "^2.2.1", + "lodash.memoize": "4.x", + "make-error": "1.x", + "semver": "7.x", + "yargs-parser": "^21.0.1" + }, + "dependencies": { + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, + "ts-node": { + "version": "10.8.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.1.tgz", + "integrity": "sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==", + "dev": true, + "requires": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + } + }, + "tsconfig-paths": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.0.0.tgz", + "integrity": "sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==", + "dev": true, + "requires": { + "json5": "^2.2.1", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true + } + } + }, + "tslib": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", + "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", + "dev": true + }, + "tsscmp": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz", + "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==" + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" + }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true + }, + "type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true + }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } + }, + "typescript": { + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz", + "integrity": "sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==", + "dev": true + }, + "uid2": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.4.tgz", + "integrity": "sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA==" + }, + "universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==" + }, + "update-browserslist-db": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", + "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "dev": true, + "requires": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + } + }, + "uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "requires": { + "punycode": "^2.1.0" + } + }, + "url": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", + "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==", + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + }, + "dependencies": { + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" + } + } + }, + "url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "requires": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==" + }, + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + }, + "v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true + }, + "v8-to-istanbul": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz", + "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^1.6.0" + }, + "dependencies": { + "convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + } + } + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "vuvuzela": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/vuvuzela/-/vuvuzela-1.0.3.tgz", + "integrity": "sha512-Tm7jR1xTzBbPW+6y1tknKiEhz04Wf/1iZkcTJjSFcpNko43+dFW6+OOeQe9taJIug3NdfUAjFKgUSyQrIKaDvQ==" + }, + "wait-on": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.0.tgz", + "integrity": "sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==", + "dev": true, + "requires": { + "axios": "^0.21.1", + "joi": "^17.4.0", + "lodash": "^4.17.21", + "minimist": "^1.2.5", + "rxjs": "^7.1.0" + }, + "dependencies": { + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dev": true, + "requires": { + "follow-redirects": "^1.14.0" + } + } + } + }, + "walker": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dev": true, + "requires": { + "makeerror": "1.0.12" + } + }, + "webfinger": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/webfinger/-/webfinger-0.4.2.tgz", + "integrity": "sha512-PvvQ/k74HkC3q5G7bGu4VYeKDt3ePZMzT5qFPtEnOL8eyIU1/06OtDn9X5vlkQ23BlegA3eN89rDLiYUife3xQ==", + "requires": { + "step": "0.0.x", + "xml2js": "0.1.x" + } + }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "requires": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + }, + "write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + } + }, + "write-stream": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/write-stream/-/write-stream-0.4.3.tgz", + "integrity": "sha512-IJrvkhbAnj89W/GAVdVgbnPiVw5Ntg/B4tc/MUCIEwj/g6JIww1DWJyB/yBMT3yw2/TkT6IUZ0+IYef3flEw8A==", + "requires": { + "readable-stream": "~0.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-0.0.4.tgz", + "integrity": "sha512-azrivNydKRYt7zwLV5wWUK7YzKTWs3q87xSmY6DlHapPrCvaT6ZrukvM5erV+yCSSPmZT8zkSdttOHQpWWm9zw==" + } + } + }, + "xml2js": { + "version": "0.1.14", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz", + "integrity": "sha512-pbdws4PPPNc1HPluSUKamY4GWMk592K7qwcj6BExbVOhhubub8+pMda/ql68b6L3luZs/OGjGSB5goV7SnmgnA==", + "requires": { + "sax": ">=0.1.1" + } + }, + "xmlbuilder": { + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "integrity": "sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==" + }, + "xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "yargs": { + "version": "17.7.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz", + "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==", + "dev": true, + "requires": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + } + }, + "yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true + }, + "ylru": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/ylru/-/ylru-1.3.2.tgz", + "integrity": "sha512-RXRJzMiK6U2ye0BlGGZnmpwJDPgakn6aNQ0A7gHRbD4I0uvK4TW6UqkK1V0pp9jskjJBAXd3dRrbzWkqJ+6cxA==" + }, + "yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true + }, + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true + }, + "zlib": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/zlib/-/zlib-1.0.5.tgz", + "integrity": "sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w==" + } + } +} From 58878ac57c2735b9238d49391cff66e88b96c12b Mon Sep 17 00:00:00 2001 From: jvcalderon Date: Thu, 11 May 2023 08:20:52 +0200 Subject: [PATCH 326/521] Adds account locking if user limit is exceeded --- .../licensing/AccountLockedModal.svelte | 31 +++++++++++++++++++ .../portal/licensing/licensingBanners.js | 15 +++------ .../src/components/start/AppRow.svelte | 11 +++++-- .../src/pages/builder/apps/index.svelte | 2 +- .../pages/builder/portal/apps/index.svelte | 28 ++++++++++++++--- .../users/_components/AddUserModal.svelte | 4 +-- .../users/_components/ImportUsersModal.svelte | 6 ++-- .../builder/portal/users/users/index.svelte | 12 +++---- .../builder/src/stores/portal/licensing.js | 22 ++++++------- 9 files changed, 89 insertions(+), 42 deletions(-) create mode 100644 packages/builder/src/components/portal/licensing/AccountLockedModal.svelte diff --git a/packages/builder/src/components/portal/licensing/AccountLockedModal.svelte b/packages/builder/src/components/portal/licensing/AccountLockedModal.svelte new file mode 100644 index 0000000000..63bb6dcfd9 --- /dev/null +++ b/packages/builder/src/components/portal/licensing/AccountLockedModal.svelte @@ -0,0 +1,31 @@ + + + + + Due to the free plan user limit being exceeded, your account has been + de-activated. Upgrade your plan to re-activate your account. + + diff --git a/packages/builder/src/components/portal/licensing/licensingBanners.js b/packages/builder/src/components/portal/licensing/licensingBanners.js index dafa8cfaed..ea4a1bb946 100644 --- a/packages/builder/src/components/portal/licensing/licensingBanners.js +++ b/packages/builder/src/components/portal/licensing/licensingBanners.js @@ -3,7 +3,6 @@ import { temporalStore } from "builderStore" import { admin, auth, licensing } from "stores/portal" import { get } from "svelte/store" import { BANNER_TYPES } from "@budibase/bbui" -import { capitalise } from "helpers" const oneDayInSeconds = 86400 @@ -146,23 +145,19 @@ const buildUsersAboveLimitBanner = EXPIRY_KEY => { const userLicensing = get(licensing) return { key: EXPIRY_KEY, - type: BANNER_TYPES.WARNING, + type: BANNER_TYPES.NEGATIVE, onChange: () => { defaultCacheFn(EXPIRY_KEY) }, criteria: () => { - return userLicensing.warnUserLimit + return userLicensing.errUserLimit }, - message: `${capitalise( - userLicensing.license.plan.type - )} plan changes - Users will be limited to ${ - userLicensing.userLimit - } users in ${userLicensing.userLimitDays}`, + message: "Your Budibase account is de-activated. Upgrade your plan", ...{ - extraButtonText: "Find out more", + extraButtonText: "View plans", extraButtonAction: () => { defaultCacheFn(ExpiringKeys.LICENSING_USERS_ABOVE_LIMIT_BANNER) - window.location.href = "/builder/portal/users/users" + window.location.href = "https://budibase.com/pricing/" }, }, showCloseButton: true, diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index 34d083a096..194f897fdc 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -6,6 +6,8 @@ export let app + export let lockedAction + const handleDefaultClick = () => { if (window.innerWidth < 640) { goToOverview() @@ -29,7 +31,7 @@ } -
+
@@ -58,8 +60,11 @@
- - + +
diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte index 23f4df5bb5..4b77671345 100644 --- a/packages/builder/src/pages/builder/apps/index.svelte +++ b/packages/builder/src/pages/builder/apps/index.svelte @@ -133,7 +133,7 @@ - {#if $licensing.usageMetrics?.dayPasses >= 100} + {#if $licensing.usageMetrics?.dayPasses >= 100 || $licensing.errUserLimit}
spaceman diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 783cac49d7..edd308f382 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -14,6 +14,7 @@ import Spinner from "components/common/Spinner.svelte" import CreateAppModal from "components/start/CreateAppModal.svelte" import AppLimitModal from "components/portal/licensing/AppLimitModal.svelte" + import AccountLockedModal from "components/portal/licensing/AccountLockedModal.svelte" import { store, automationStore } from "builderStore" import { API } from "api" @@ -28,6 +29,7 @@ let template let creationModal let appLimitModal + let accountLockedModal let creatingApp = false let searchTerm = "" let creatingFromTemplate = false @@ -49,6 +51,10 @@ ) $: automationErrors = getAutomationErrors(enrichedApps) + const usersLimitLockAction = $licensing?.errUserLimit + ? () => accountLockedModal.show() + : null + const enrichApps = (apps, user, sortBy) => { const enrichedApps = apps.map(app => ({ ...app, @@ -189,6 +195,9 @@ creatingFromTemplate = true createAppFromTemplateUrl(initInfo.init_template) } + if (usersLimitLockAction) { + usersLimitLockAction() + } } catch (error) { notifications.error("Error getting init info") } @@ -230,20 +239,30 @@
- {#if $apps?.length > 0} {/if} {#if !$apps?.length} - {/if} @@ -267,7 +286,7 @@
{#each filteredApps as app (app.appId)} - + {/each}
@@ -294,6 +313,7 @@ + diff --git a/packages/bbui/src/FancyForm/FancyField.svelte b/packages/bbui/src/FancyForm/FancyField.svelte index 89f2dec7d0..0c99394599 100644 --- a/packages/bbui/src/FancyForm/FancyField.svelte +++ b/packages/bbui/src/FancyForm/FancyField.svelte @@ -1,7 +1,7 @@ + +
+ + a-happy-budibase-user +
+ "{testimonial.text}" +
+
+
{testimonial.name}
+
{testimonial.role}
+
+ +
+ + diff --git a/packages/frontend-core/src/components/TestimonialPage.svelte b/packages/frontend-core/src/components/TestimonialPage.svelte index bbb61d2276..94983384a8 100644 --- a/packages/frontend-core/src/components/TestimonialPage.svelte +++ b/packages/frontend-core/src/components/TestimonialPage.svelte @@ -1,58 +1,15 @@
{#if enabled} -
- - a-happy-budibase-user -
- "{testimonial.text}" -
-
-
{testimonial.name}
-
{testimonial.role}
-
- -
+ {/if}
@@ -64,20 +21,4 @@ display: grid; place-items: center; } - .testimonial { - width: 380px; - padding: 40px; - } - .text { - font-size: var(--font-size-l); - font-style: italic; - } - .name { - font-weight: bold; - color: var(--spectrum-global-color-gray-900); - font-size: var(--font-size-l); - } - .company { - color: var(--spectrum-global-color-gray-700); - } diff --git a/packages/frontend-core/src/components/index.js b/packages/frontend-core/src/components/index.js index 2b7033ad8f..88107da535 100644 --- a/packages/frontend-core/src/components/index.js +++ b/packages/frontend-core/src/components/index.js @@ -1,3 +1,4 @@ export { default as SplitPage } from "./SplitPage.svelte" export { default as TestimonialPage } from "./TestimonialPage.svelte" +export { default as Testimonial } from "./Testimonial.svelte" export { Grid } from "./grid" From f33f7b1143590057aaf50af89f446099f7bf0b63 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 17 May 2023 11:59:14 +0200 Subject: [PATCH 471/521] Tidy pipelines --- .github/workflows/budibase_ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 17929cc33d..d05497c3a8 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -97,7 +97,8 @@ jobs: cache: "yarn" - run: yarn - run: yarn build - - run: | + - name: Run tests + run: | cd qa-core yarn setup yarn test:ci From 00cbe5a2d574a1cdc52b7f72f2af9531430bf59a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 17 May 2023 10:00:25 +0000 Subject: [PATCH 472/521] Bump version to 2.6.16-alpha.3 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index e56d307592..5253871cbc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.16-alpha.2", + "version": "2.6.16-alpha.3", "npmClient": "yarn", "packages": [ "packages/backend-core", From 79bc2afeca550368f5495e53183c56723080c5aa Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 17 May 2023 12:04:06 +0200 Subject: [PATCH 473/521] Run validators nightly --- .../validators/{arango.spec.ts => arango.nightly.spec.ts} | 0 .../validators/{couch.spec.ts => couch.nightly.spec.ts} | 0 .../validators/{dynamodb.spec.ts => dynamodb.nightly.spec.ts} | 0 .../validators/{elastic.spec.ts => elastic.nightly.spec.ts} | 0 .../validators/{mongo.spec.ts => mongo.nightly.spec.ts} | 0 .../validators/{mssql.spec.ts => mssql.nightly.spec.ts} | 0 .../validators/{mysql.spec.ts => mysql.nightly.spec.ts} | 0 .../validators/{postgres.spec.ts => postgres.nightly.spec.ts} | 0 .../validators/{redis.spec.ts => redis.nightly.spec.ts} | 0 .../integrations/validators/{s3.spec.ts => s3.nightly.spec.ts} | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename qa-core/src/integrations/validators/{arango.spec.ts => arango.nightly.spec.ts} (100%) rename qa-core/src/integrations/validators/{couch.spec.ts => couch.nightly.spec.ts} (100%) rename qa-core/src/integrations/validators/{dynamodb.spec.ts => dynamodb.nightly.spec.ts} (100%) rename qa-core/src/integrations/validators/{elastic.spec.ts => elastic.nightly.spec.ts} (100%) rename qa-core/src/integrations/validators/{mongo.spec.ts => mongo.nightly.spec.ts} (100%) rename qa-core/src/integrations/validators/{mssql.spec.ts => mssql.nightly.spec.ts} (100%) rename qa-core/src/integrations/validators/{mysql.spec.ts => mysql.nightly.spec.ts} (100%) rename qa-core/src/integrations/validators/{postgres.spec.ts => postgres.nightly.spec.ts} (100%) rename qa-core/src/integrations/validators/{redis.spec.ts => redis.nightly.spec.ts} (100%) rename qa-core/src/integrations/validators/{s3.spec.ts => s3.nightly.spec.ts} (100%) diff --git a/qa-core/src/integrations/validators/arango.spec.ts b/qa-core/src/integrations/validators/arango.nightly.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/arango.spec.ts rename to qa-core/src/integrations/validators/arango.nightly.spec.ts diff --git a/qa-core/src/integrations/validators/couch.spec.ts b/qa-core/src/integrations/validators/couch.nightly.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/couch.spec.ts rename to qa-core/src/integrations/validators/couch.nightly.spec.ts diff --git a/qa-core/src/integrations/validators/dynamodb.spec.ts b/qa-core/src/integrations/validators/dynamodb.nightly.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/dynamodb.spec.ts rename to qa-core/src/integrations/validators/dynamodb.nightly.spec.ts diff --git a/qa-core/src/integrations/validators/elastic.spec.ts b/qa-core/src/integrations/validators/elastic.nightly.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/elastic.spec.ts rename to qa-core/src/integrations/validators/elastic.nightly.spec.ts diff --git a/qa-core/src/integrations/validators/mongo.spec.ts b/qa-core/src/integrations/validators/mongo.nightly.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/mongo.spec.ts rename to qa-core/src/integrations/validators/mongo.nightly.spec.ts diff --git a/qa-core/src/integrations/validators/mssql.spec.ts b/qa-core/src/integrations/validators/mssql.nightly.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/mssql.spec.ts rename to qa-core/src/integrations/validators/mssql.nightly.spec.ts diff --git a/qa-core/src/integrations/validators/mysql.spec.ts b/qa-core/src/integrations/validators/mysql.nightly.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/mysql.spec.ts rename to qa-core/src/integrations/validators/mysql.nightly.spec.ts diff --git a/qa-core/src/integrations/validators/postgres.spec.ts b/qa-core/src/integrations/validators/postgres.nightly.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/postgres.spec.ts rename to qa-core/src/integrations/validators/postgres.nightly.spec.ts diff --git a/qa-core/src/integrations/validators/redis.spec.ts b/qa-core/src/integrations/validators/redis.nightly.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/redis.spec.ts rename to qa-core/src/integrations/validators/redis.nightly.spec.ts diff --git a/qa-core/src/integrations/validators/s3.spec.ts b/qa-core/src/integrations/validators/s3.nightly.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/s3.spec.ts rename to qa-core/src/integrations/validators/s3.nightly.spec.ts From b2109e6160f1422bc81a3ce246fa8fef1d80cce9 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 17 May 2023 10:20:20 +0000 Subject: [PATCH 474/521] Bump version to 2.6.16-alpha.4 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 5253871cbc..45abc9671f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.16-alpha.3", + "version": "2.6.16-alpha.4", "npmClient": "yarn", "packages": [ "packages/backend-core", From 08babf719e5d4c446a3a5d7c1453cc4fec58f2c4 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 17 May 2023 12:41:26 +0200 Subject: [PATCH 475/521] Fix build deps --- .github/workflows/budibase_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index d05497c3a8..930d878488 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -59,7 +59,7 @@ jobs: node-version: 14.x cache: "yarn" - run: yarn - - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core --scope=@budibase/string-templates + - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core --scope=@budibase/string-templates --scope=@budibase/client - run: yarn test --ignore=@budibase/pro - uses: codecov/codecov-action@v3 with: From 60109ebcda5a9edafb64d01b4b39a0d60ed3ed3e Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 17 May 2023 12:55:04 +0200 Subject: [PATCH 476/521] Fix manifest usage --- .github/workflows/budibase_ci.yml | 2 +- packages/server/src/utilities/fileSystem/app.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 930d878488..d05497c3a8 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -59,7 +59,7 @@ jobs: node-version: 14.x cache: "yarn" - run: yarn - - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core --scope=@budibase/string-templates --scope=@budibase/client + - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core --scope=@budibase/string-templates - run: yarn test --ignore=@budibase/pro - uses: codecov/codecov-action@v3 with: diff --git a/packages/server/src/utilities/fileSystem/app.ts b/packages/server/src/utilities/fileSystem/app.ts index f5e1f6e40e..0decf73a54 100644 --- a/packages/server/src/utilities/fileSystem/app.ts +++ b/packages/server/src/utilities/fileSystem/app.ts @@ -35,7 +35,7 @@ export const getComponentLibraryManifest = async (library: string) => { const filename = "manifest.json" if (env.isDev() || env.isTest()) { - const path = join(NODE_MODULES_PATH, "@budibase", "client", filename) + const path = join(TOP_LEVEL_PATH, "../client", filename) // always load from new so that updates are refreshed delete require.cache[require.resolve(path)] return require(path) From eb46037344e512fe1a9614ba01f65c3b669747ee Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 17 May 2023 12:59:20 +0200 Subject: [PATCH 477/521] Rename validator integration tests --- .../{arango.nightly.spec.ts => arango.integration.spec.ts} | 0 .../{couch.nightly.spec.ts => couch.integration.spec.ts} | 0 .../{dynamodb.nightly.spec.ts => dynamodb.integration.spec.ts} | 0 .../{elastic.nightly.spec.ts => elastic.integration.spec.ts} | 0 .../{mongo.nightly.spec.ts => mongo.integration.spec.ts} | 0 .../{mssql.nightly.spec.ts => mssql.integration.spec.ts} | 0 .../{mysql.nightly.spec.ts => mysql.integration.spec.ts} | 0 .../{postgres.nightly.spec.ts => postgres.integration.spec.ts} | 1 - .../{redis.nightly.spec.ts => redis.integration.spec.ts} | 0 .../validators/{s3.nightly.spec.ts => s3.integration.spec.ts} | 0 10 files changed, 1 deletion(-) rename qa-core/src/integrations/validators/{arango.nightly.spec.ts => arango.integration.spec.ts} (100%) rename qa-core/src/integrations/validators/{couch.nightly.spec.ts => couch.integration.spec.ts} (100%) rename qa-core/src/integrations/validators/{dynamodb.nightly.spec.ts => dynamodb.integration.spec.ts} (100%) rename qa-core/src/integrations/validators/{elastic.nightly.spec.ts => elastic.integration.spec.ts} (100%) rename qa-core/src/integrations/validators/{mongo.nightly.spec.ts => mongo.integration.spec.ts} (100%) rename qa-core/src/integrations/validators/{mssql.nightly.spec.ts => mssql.integration.spec.ts} (100%) rename qa-core/src/integrations/validators/{mysql.nightly.spec.ts => mysql.integration.spec.ts} (100%) rename qa-core/src/integrations/validators/{postgres.nightly.spec.ts => postgres.integration.spec.ts} (94%) rename qa-core/src/integrations/validators/{redis.nightly.spec.ts => redis.integration.spec.ts} (100%) rename qa-core/src/integrations/validators/{s3.nightly.spec.ts => s3.integration.spec.ts} (100%) diff --git a/qa-core/src/integrations/validators/arango.nightly.spec.ts b/qa-core/src/integrations/validators/arango.integration.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/arango.nightly.spec.ts rename to qa-core/src/integrations/validators/arango.integration.spec.ts diff --git a/qa-core/src/integrations/validators/couch.nightly.spec.ts b/qa-core/src/integrations/validators/couch.integration.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/couch.nightly.spec.ts rename to qa-core/src/integrations/validators/couch.integration.spec.ts diff --git a/qa-core/src/integrations/validators/dynamodb.nightly.spec.ts b/qa-core/src/integrations/validators/dynamodb.integration.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/dynamodb.nightly.spec.ts rename to qa-core/src/integrations/validators/dynamodb.integration.spec.ts diff --git a/qa-core/src/integrations/validators/elastic.nightly.spec.ts b/qa-core/src/integrations/validators/elastic.integration.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/elastic.nightly.spec.ts rename to qa-core/src/integrations/validators/elastic.integration.spec.ts diff --git a/qa-core/src/integrations/validators/mongo.nightly.spec.ts b/qa-core/src/integrations/validators/mongo.integration.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/mongo.nightly.spec.ts rename to qa-core/src/integrations/validators/mongo.integration.spec.ts diff --git a/qa-core/src/integrations/validators/mssql.nightly.spec.ts b/qa-core/src/integrations/validators/mssql.integration.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/mssql.nightly.spec.ts rename to qa-core/src/integrations/validators/mssql.integration.spec.ts diff --git a/qa-core/src/integrations/validators/mysql.nightly.spec.ts b/qa-core/src/integrations/validators/mysql.integration.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/mysql.nightly.spec.ts rename to qa-core/src/integrations/validators/mysql.integration.spec.ts diff --git a/qa-core/src/integrations/validators/postgres.nightly.spec.ts b/qa-core/src/integrations/validators/postgres.integration.spec.ts similarity index 94% rename from qa-core/src/integrations/validators/postgres.nightly.spec.ts rename to qa-core/src/integrations/validators/postgres.integration.spec.ts index 5101cf1d2d..029d929df0 100644 --- a/qa-core/src/integrations/validators/postgres.nightly.spec.ts +++ b/qa-core/src/integrations/validators/postgres.integration.spec.ts @@ -1,5 +1,4 @@ import { GenericContainer } from "testcontainers" -import postgres from "../../../../packages/server/src/integrations/postgres" jest.unmock("pg") diff --git a/qa-core/src/integrations/validators/redis.nightly.spec.ts b/qa-core/src/integrations/validators/redis.integration.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/redis.nightly.spec.ts rename to qa-core/src/integrations/validators/redis.integration.spec.ts diff --git a/qa-core/src/integrations/validators/s3.nightly.spec.ts b/qa-core/src/integrations/validators/s3.integration.spec.ts similarity index 100% rename from qa-core/src/integrations/validators/s3.nightly.spec.ts rename to qa-core/src/integrations/validators/s3.integration.spec.ts From 02fc795d982b3b57129b811f65d8f1ac4332311f Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 17 May 2023 13:00:08 +0200 Subject: [PATCH 478/521] Rename nightly.spec to integration.spec --- qa-core/package.json | 2 +- .../{mariaDB.nightly.spec.ts => mariaDB.integration.spec.ts} | 0 .../{mongoDB.nightly.spec.ts => mongoDB.integration.spec.ts} | 0 ...tgresSQL.nightly.spec.ts => postgresSQL.integration.spec.ts} | 0 .../{restAPI.nightly.spec.ts => restAPI.integration.spec.ts} | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename qa-core/src/internal-api/tests/dataSources/{mariaDB.nightly.spec.ts => mariaDB.integration.spec.ts} (100%) rename qa-core/src/internal-api/tests/dataSources/{mongoDB.nightly.spec.ts => mongoDB.integration.spec.ts} (100%) rename qa-core/src/internal-api/tests/dataSources/{postgresSQL.nightly.spec.ts => postgresSQL.integration.spec.ts} (100%) rename qa-core/src/internal-api/tests/dataSources/{restAPI.nightly.spec.ts => restAPI.integration.spec.ts} (100%) diff --git a/qa-core/package.json b/qa-core/package.json index a6f9537d0f..2cfc8e2865 100644 --- a/qa-core/package.json +++ b/qa-core/package.json @@ -14,7 +14,7 @@ "test:watch": "yarn run test --watch", "test:debug": "DEBUG=1 yarn run test", "test:notify": "node scripts/testResultsWebhook", - "test:smoke": "yarn run test --testPathIgnorePatterns=/.+\\.nightly\\.spec\\.ts", + "test:smoke": "yarn run test --testPathIgnorePatterns=/.+\\.integration\\.spec\\.ts", "test:ci": "start-server-and-test dev:built http://localhost:4001/health test:smoke", "dev:built": "cd ../ && yarn dev:built" }, diff --git a/qa-core/src/internal-api/tests/dataSources/mariaDB.nightly.spec.ts b/qa-core/src/internal-api/tests/dataSources/mariaDB.integration.spec.ts similarity index 100% rename from qa-core/src/internal-api/tests/dataSources/mariaDB.nightly.spec.ts rename to qa-core/src/internal-api/tests/dataSources/mariaDB.integration.spec.ts diff --git a/qa-core/src/internal-api/tests/dataSources/mongoDB.nightly.spec.ts b/qa-core/src/internal-api/tests/dataSources/mongoDB.integration.spec.ts similarity index 100% rename from qa-core/src/internal-api/tests/dataSources/mongoDB.nightly.spec.ts rename to qa-core/src/internal-api/tests/dataSources/mongoDB.integration.spec.ts diff --git a/qa-core/src/internal-api/tests/dataSources/postgresSQL.nightly.spec.ts b/qa-core/src/internal-api/tests/dataSources/postgresSQL.integration.spec.ts similarity index 100% rename from qa-core/src/internal-api/tests/dataSources/postgresSQL.nightly.spec.ts rename to qa-core/src/internal-api/tests/dataSources/postgresSQL.integration.spec.ts diff --git a/qa-core/src/internal-api/tests/dataSources/restAPI.nightly.spec.ts b/qa-core/src/internal-api/tests/dataSources/restAPI.integration.spec.ts similarity index 100% rename from qa-core/src/internal-api/tests/dataSources/restAPI.nightly.spec.ts rename to qa-core/src/internal-api/tests/dataSources/restAPI.integration.spec.ts From 42f472b038adacb1b62b3d9752a17c19e2057c0b Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 17 May 2023 12:26:07 +0100 Subject: [PATCH 479/521] Type updates for automation jobs --- packages/server/src/automations/triggers.ts | 8 +++++--- packages/server/src/definitions/automations.ts | 5 +---- packages/server/src/threads/automation.ts | 11 +++++------ packages/server/src/threads/definitions.ts | 2 -- packages/server/src/threads/index.ts | 6 ++++-- packages/types/src/documents/app/automation.ts | 5 +++++ packages/types/src/sdk/automations/index.ts | 15 +++++++++++++++ packages/types/src/sdk/index.ts | 1 + 8 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 packages/types/src/sdk/automations/index.ts diff --git a/packages/server/src/automations/triggers.ts b/packages/server/src/automations/triggers.ts index 78f8a87b0c..3436c1be7a 100644 --- a/packages/server/src/automations/triggers.ts +++ b/packages/server/src/automations/triggers.ts @@ -9,7 +9,7 @@ import { checkTestFlag } from "../utilities/redis" import * as utils from "./utils" import env from "../environment" import { context, db as dbCore } from "@budibase/backend-core" -import { Automation, Row } from "@budibase/types" +import { Automation, Row, AutomationData, AutomationJob } from "@budibase/types" export const TRIGGER_DEFINITIONS = definitions const JOB_OPTS = { @@ -109,14 +109,16 @@ export async function externalTrigger( } params.fields = coercedFields } - const data: Record = { automation, event: params } + + const data: AutomationData = { automation, event: params as any } if (getResponses) { data.event = { ...data.event, appId: context.getAppId(), automation, } - return utils.processEvent({ data }) + const job = { data } as AutomationJob + return utils.processEvent(job) } else { return automationQueue.add(data, JOB_OPTS) } diff --git a/packages/server/src/definitions/automations.ts b/packages/server/src/definitions/automations.ts index 79cbe6e4ac..d7a7b42095 100644 --- a/packages/server/src/definitions/automations.ts +++ b/packages/server/src/definitions/automations.ts @@ -1,4 +1,4 @@ -import { AutomationResults, AutomationStep, Document } from "@budibase/types" +import { AutomationResults, AutomationStep } from "@budibase/types" export enum LoopStepType { ARRAY = "Array", @@ -28,6 +28,3 @@ export interface AutomationContext extends AutomationResults { trigger: any } -export interface AutomationMetadata extends Document { - errorCount?: number -} diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts index adc1a83af0..6bfb6afc25 100644 --- a/packages/server/src/threads/automation.ts +++ b/packages/server/src/threads/automation.ts @@ -13,13 +13,12 @@ import { generateAutomationMetadataID, isProdAppID } from "../db/utils" import { definitions as triggerDefs } from "../automations/triggerInfo" import { AutomationErrors, MAX_AUTOMATION_RECURRING_ERRORS } from "../constants" import { storeLog } from "../automations/logging" -import { Automation, AutomationStep, AutomationStatus } from "@budibase/types" +import { Automation, AutomationStep, AutomationStatus, AutomationMetadata, AutomationJob } from "@budibase/types" import { LoopStep, LoopInput, TriggerOutput, AutomationContext, - AutomationMetadata, } from "../definitions/automations" import { WorkerCallback } from "./definitions" import { context, logging } from "@budibase/backend-core" @@ -60,11 +59,11 @@ class Orchestrator { _job: Job executionOutput: AutomationContext - constructor(job: Job) { - let automation = job.data.automation, - triggerOutput = job.data.event + constructor(job: AutomationJob) { + let automation = job.data.automation + let triggerOutput = job.data.event const metadata = triggerOutput.metadata - this._chainCount = metadata ? metadata.automationChainCount : 0 + this._chainCount = metadata ? metadata.automationChainCount! : 0 this._appId = triggerOutput.appId as string this._job = job const triggerStepId = automation.definition.trigger.stepId diff --git a/packages/server/src/threads/definitions.ts b/packages/server/src/threads/definitions.ts index 2cf5d8066c..21e7ce0b69 100644 --- a/packages/server/src/threads/definitions.ts +++ b/packages/server/src/threads/definitions.ts @@ -1,5 +1,3 @@ -import { EnvironmentVariablesDecrypted } from "@budibase/types" - export type WorkerCallback = (error: any, response?: any) => void export interface QueryEvent { diff --git a/packages/server/src/threads/index.ts b/packages/server/src/threads/index.ts index 6876f1a07c..9b6bffa867 100644 --- a/packages/server/src/threads/index.ts +++ b/packages/server/src/threads/index.ts @@ -1,5 +1,7 @@ import workerFarm from "worker-farm" import env from "../environment" +import { AutomationJob } from "@budibase/types" +import { QueryEvent } from "./definitions" export const ThreadType = { QUERY: "query", @@ -64,11 +66,11 @@ export class Thread { ) } - run(data: any) { + run(job: AutomationJob | QueryEvent) { const timeout = this.timeoutMs return new Promise((resolve, reject) => { function fire(worker: any) { - worker.execute(data, (err: any, response: any) => { + worker.execute(job, (err: any, response: any) => { if (err && err.type === "TimeoutError") { reject( new Error(`Query response time exceeded ${timeout}ms timeout.`) diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts index 110a2c0642..f726e70b21 100644 --- a/packages/types/src/documents/app/automation.ts +++ b/packages/types/src/documents/app/automation.ts @@ -177,3 +177,8 @@ export type AutomationStepInput = { appId: string apiKey?: string } + +export interface AutomationMetadata extends Document { + errorCount?: number + automationChainCount?: number +} \ No newline at end of file diff --git a/packages/types/src/sdk/automations/index.ts b/packages/types/src/sdk/automations/index.ts new file mode 100644 index 0000000000..1025220791 --- /dev/null +++ b/packages/types/src/sdk/automations/index.ts @@ -0,0 +1,15 @@ +import { Automation, AutomationMetadata } from "../../documents" +import { Job } from "bull" + +export interface AutomationDataEvent { + appId?: string + metadata?: AutomationMetadata + automation?: Automation +} + +export interface AutomationData { + event: AutomationDataEvent + automation: Automation +} + +export type AutomationJob = Job \ No newline at end of file diff --git a/packages/types/src/sdk/index.ts b/packages/types/src/sdk/index.ts index 8fc5fb287e..ed44c13667 100644 --- a/packages/types/src/sdk/index.ts +++ b/packages/types/src/sdk/index.ts @@ -1,3 +1,4 @@ +export * from "./automations" export * from "./hosting" export * from "./context" export * from "./events" From ad37186665a0609764891936b6d7f2d59e8ec11f Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 17 May 2023 13:54:20 +0100 Subject: [PATCH 480/521] Logging updates for automations --- .../backend-core/src/context/mainContext.ts | 17 ++ packages/backend-core/src/context/types.ts | 1 + .../backend-core/src/logging/pino/logger.ts | 12 ++ packages/backend-core/src/queue/listeners.ts | 157 ++++++++++++------ packages/server/src/automations/utils.ts | 39 +++-- 5 files changed, 160 insertions(+), 66 deletions(-) diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts index 861777b679..9aa887166e 100644 --- a/packages/backend-core/src/context/mainContext.ts +++ b/packages/backend-core/src/context/mainContext.ts @@ -104,6 +104,18 @@ async function newContext(updates: ContextMap, task: any) { return Context.run(context, task) } +export async function doInAutomationContext(appId: string, automationId: string, task: any): Promise { + const tenantId = getTenantIDFromAppID(appId) + return newContext( + { + tenantId, + appId, + automationId + }, + task + ) +} + export async function doInContext(appId: string, task: any): Promise { const tenantId = getTenantIDFromAppID(appId) return newContext( @@ -187,6 +199,11 @@ export function getTenantId(): string { return tenantId } +export function getAutomationId(): string | undefined { + const context = Context.get() + return context?.automationId +} + export function getAppId(): string | undefined { const context = Context.get() const foundId = context?.appId diff --git a/packages/backend-core/src/context/types.ts b/packages/backend-core/src/context/types.ts index 727dad80bc..d687a93594 100644 --- a/packages/backend-core/src/context/types.ts +++ b/packages/backend-core/src/context/types.ts @@ -7,4 +7,5 @@ export type ContextMap = { identity?: IdentityContext environmentVariables?: Record isScim?: boolean + automationId?: string } diff --git a/packages/backend-core/src/logging/pino/logger.ts b/packages/backend-core/src/logging/pino/logger.ts index 276377eb00..14c8e7e5a9 100644 --- a/packages/backend-core/src/logging/pino/logger.ts +++ b/packages/backend-core/src/logging/pino/logger.ts @@ -39,6 +39,7 @@ if (!env.DISABLE_PINO_LOGGER) { objects?: any[] tenantId?: string appId?: string + automationId?: string identityId?: string identityType?: IdentityType correlationId?: string @@ -86,6 +87,7 @@ if (!env.DISABLE_PINO_LOGGER) { contextObject = { tenantId: getTenantId(), appId: getAppId(), + automationId: getAutomationId(), identityId: identity?._id, identityType: identity?.type, correlationId: correlation.getId(), @@ -159,6 +161,16 @@ if (!env.DISABLE_PINO_LOGGER) { return appId } + const getAutomationId = () => { + let appId + try { + appId = context.getAutomationId() + } catch (e) { + // do nothing + } + return appId + } + const getIdentity = () => { let identity try { diff --git a/packages/backend-core/src/queue/listeners.ts b/packages/backend-core/src/queue/listeners.ts index 331b690fe9..fd59bec911 100644 --- a/packages/backend-core/src/queue/listeners.ts +++ b/packages/backend-core/src/queue/listeners.ts @@ -1,5 +1,6 @@ import { Job, JobId, Queue } from "bull" import { JobQueue } from "./constants" +import * as context from "../context" export type StalledFn = (job: Job) => Promise @@ -31,77 +32,135 @@ function handleStalled(queue: Queue, removeStalledCb?: StalledFn) { }) } -function logging(queue: Queue, jobQueue: JobQueue) { - let eventType: string - switch (jobQueue) { - case JobQueue.AUTOMATION: - eventType = "automation-event" - break - case JobQueue.APP_BACKUP: - eventType = "app-backup-event" - break - case JobQueue.AUDIT_LOG: - eventType = "audit-log-event" - break - case JobQueue.SYSTEM_EVENT_QUEUE: - eventType = "system-event" - break +function getLogParams( + eventType: QueueEventType, + event: BullEvent, + opts: { + job?: Job, + jobId?: JobId, + error?: Error + } = {}, + extra: any = {} +) { + const message = `[BULL] ${eventType}=${event}` + const err = opts.error + + const data = { + eventType, + event, + job: opts.job, + jobId: opts.jobId || opts.job?.id, + ...extra } + + return [message, err, data] +} + +enum BullEvent { + ERROR="error", + WAITING="waiting", + ACTIVE="active", + STALLED="stalled", + PROGRESS="progress", + COMPLETED="completed", + FAILED="failed", + PAUSED="paused", + RESUMED="resumed", + CLEANED="cleaned", + DRAINED="drained", + REMOVED="removed", +} + +enum QueueEventType { + AUTOMATION_EVENT="automation-event", + APP_BACKUP_EVENT="app-backup-event", + AUDIT_LOG_EVENT="audit-log-event", + SYSTEM_EVENT="system-event" +} + +const EventTypeMap: { [key in JobQueue]: QueueEventType } = { + [JobQueue.AUTOMATION]: QueueEventType.AUTOMATION_EVENT, + [JobQueue.APP_BACKUP]: QueueEventType.APP_BACKUP_EVENT, + [JobQueue.AUDIT_LOG]: QueueEventType.AUDIT_LOG_EVENT, + [JobQueue.SYSTEM_EVENT_QUEUE]: QueueEventType.SYSTEM_EVENT, +} + +function logging(queue: Queue, jobQueue: JobQueue) { + const eventType = EventTypeMap[jobQueue] + + function doInJobContext(job: Job, task: any) { + // if this is an automation job try to get the app id + const appId = job.data.event?.appId + if (appId) { + return context.doInContext(appId, task) + } else { + task() + } + } + + queue + .on(BullEvent.STALLED, async (job: Job) => { + // A job has been marked as stalled. This is useful for debugging job + // workers that crash or pause the event loop. + await doInJobContext(job, () => { + console.error(...getLogParams(eventType, BullEvent.STALLED, { job })) + }) + }) + .on(BullEvent.ERROR, (error: any) => { + // An error occurred. + console.error(...getLogParams(eventType, BullEvent.ERROR, { error })) + }) + if (process.env.NODE_DEBUG?.includes("bull")) { queue - .on("error", (error: any) => { - // An error occurred. - console.error(`${eventType}=error error=${JSON.stringify(error)}`) - }) - .on("waiting", (jobId: JobId) => { + .on(BullEvent.WAITING, (jobId: JobId) => { // A Job is waiting to be processed as soon as a worker is idling. - console.log(`${eventType}=waiting jobId=${jobId}`) + console.info(...getLogParams(eventType, BullEvent.WAITING, { jobId })) }) - .on("active", (job: Job, jobPromise: any) => { + .on(BullEvent.ACTIVE, async (job: Job, jobPromise: any) => { // A job has started. You can use `jobPromise.cancel()`` to abort it. - console.log(`${eventType}=active jobId=${job.id}`) + await doInJobContext(job, () => { + console.info(...getLogParams(eventType, BullEvent.ACTIVE, { job })) + }) }) - .on("stalled", (job: Job) => { - // A job has been marked as stalled. This is useful for debugging job - // workers that crash or pause the event loop. - console.error( - `${eventType}=stalled jobId=${job.id} job=${JSON.stringify(job)}` - ) + .on(BullEvent.PROGRESS, async (job: Job, progress: any) => { + // A job's progress was updated + await doInJobContext(job, () => { + console.info(...getLogParams(eventType, BullEvent.PROGRESS, { job }, { progress })) + }) }) - .on("progress", (job: Job, progress: any) => { - // A job's progress was updated! - console.log( - `${eventType}=progress jobId=${job.id} progress=${progress}` - ) - }) - .on("completed", (job: Job, result) => { + .on(BullEvent.COMPLETED, async (job: Job, result) => { // A job successfully completed with a `result`. - console.log(`${eventType}=completed jobId=${job.id} result=${result}`) + await doInJobContext(job, () => { + console.info(...getLogParams(eventType, BullEvent.COMPLETED, { job }, { result })) + }) }) - .on("failed", (job, err: any) => { + .on(BullEvent.FAILED, async (job: Job, error: any) => { // A job failed with reason `err`! - console.log(`${eventType}=failed jobId=${job.id} error=${err}`) + await doInJobContext(job, () => { + console.error(...getLogParams(eventType, BullEvent.FAILED, { job, error })) + }) }) - .on("paused", () => { + .on(BullEvent.PAUSED, () => { // The queue has been paused. - console.log(`${eventType}=paused`) + console.info(...getLogParams(eventType, BullEvent.PAUSED)) }) - .on("resumed", (job: Job) => { + .on(BullEvent.RESUMED, () => { // The queue has been resumed. - console.log(`${eventType}=paused jobId=${job.id}`) + console.info(...getLogParams(eventType, BullEvent.RESUMED)) }) - .on("cleaned", (jobs: Job[], type: string) => { + .on(BullEvent.CLEANED, (jobs: Job[], type: string) => { // Old jobs have been cleaned from the queue. `jobs` is an array of cleaned // jobs, and `type` is the type of jobs cleaned. - console.log(`${eventType}=cleaned length=${jobs.length} type=${type}`) + console.info(...getLogParams(eventType, BullEvent.CLEANED, {}, { length: jobs.length, type } )) }) - .on("drained", () => { + .on(BullEvent.DRAINED, () => { // Emitted every time the queue has processed all the waiting jobs (even if there can be some delayed jobs not yet processed) - console.log(`${eventType}=drained`) + console.info(...getLogParams(eventType, BullEvent.DRAINED )) }) - .on("removed", (job: Job) => { + .on(BullEvent.REMOVED, (job: Job) => { // A job successfully removed. - console.log(`${eventType}=removed jobId=${job.id}`) + console.info(...getLogParams(eventType, BullEvent.REMOVED, { job } )) }) } } diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts index 5296a0fa50..50c9b77818 100644 --- a/packages/server/src/automations/utils.ts +++ b/packages/server/src/automations/utils.ts @@ -8,7 +8,7 @@ import { db as dbCore, context } from "@budibase/backend-core" import { getAutomationMetadataParams } from "../db/utils" import { cloneDeep } from "lodash/fp" import { quotas } from "@budibase/pro" -import { Automation, WebhookActionType } from "@budibase/types" +import { Automation, AutomationJob, WebhookActionType } from "@budibase/types" import sdk from "../sdk" const REBOOT_CRON = "@reboot" @@ -16,27 +16,32 @@ const WH_STEP_ID = definitions.WEBHOOK.stepId const CRON_STEP_ID = definitions.CRON.stepId const Runner = new Thread(ThreadType.AUTOMATION) -const jobMessage = (job: any, message: string) => { - return `app=${job.data.event.appId} automation=${job.data.automation._id} jobId=${job.id} trigger=${job.data.automation.definition.trigger.event} : ${message}` +function loggingArgs(job: AutomationJob) { + return { + jobId: job.id, + trigger: job.data.automation.definition.trigger.event + } } -export async function processEvent(job: any) { - try { - const automationId = job.data.automation._id - console.log(jobMessage(job, "running")) - // need to actually await these so that an error can be captured properly - return await context.doInContext(job.data.event.appId, async () => { +export async function processEvent(job: AutomationJob) { + const appId = job.data.event.appId! + const automationId = job.data.automation._id! + return await context.doInAutomationContext(appId, automationId, async () => { + try { + // need to actually await these so that an error can be captured properly + console.log("automation running", loggingArgs(job)) + const runFn = () => Runner.run(job) - return quotas.addAutomation(runFn, { + const result = await quotas.addAutomation(runFn, { automationId, }) - }) - } catch (err) { - const errJson = JSON.stringify(err) - console.error(jobMessage(job, `was unable to run - ${errJson}`)) - console.trace(err) - return { err } - } + console.log("automation completed", loggingArgs(job)) + return result + } catch (err) { + console.error(`automation was unable to run`, err, loggingArgs(job)) + return { err } + } + }) } export async function updateTestHistory( From 578b5994288661ec57aa98d1b903cf5b70078382 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 17 May 2023 14:10:22 +0100 Subject: [PATCH 481/521] Lint --- .../backend-core/src/context/mainContext.ts | 8 +- packages/backend-core/src/queue/listeners.ts | 68 +++++---- .../console-control-strings/README.md~ | 140 ++++++++++++++++++ .../node_modules/copy-concurrently/README.md~ | 127 ++++++++++++++++ .../node_modules/move-concurrently/README.md~ | 52 +++++++ packages/pro/node_modules/umask/index.js~ | 68 +++++++++ .../pro/node_modules/umask/test/ChangeLog~ | 5 + .../pro/node_modules/umask/test/simple.js~ | 14 ++ packages/server/src/automations/utils.ts | 2 +- .../server/src/definitions/automations.ts | 1 - packages/server/src/threads/automation.ts | 8 +- .../types/src/documents/app/automation.ts | 2 +- packages/types/src/sdk/automations/index.ts | 2 +- 13 files changed, 465 insertions(+), 32 deletions(-) create mode 100644 packages/pro/node_modules/console-control-strings/README.md~ create mode 100644 packages/pro/node_modules/copy-concurrently/README.md~ create mode 100644 packages/pro/node_modules/move-concurrently/README.md~ create mode 100644 packages/pro/node_modules/umask/index.js~ create mode 100644 packages/pro/node_modules/umask/test/ChangeLog~ create mode 100644 packages/pro/node_modules/umask/test/simple.js~ diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts index 9aa887166e..492e0abb10 100644 --- a/packages/backend-core/src/context/mainContext.ts +++ b/packages/backend-core/src/context/mainContext.ts @@ -104,13 +104,17 @@ async function newContext(updates: ContextMap, task: any) { return Context.run(context, task) } -export async function doInAutomationContext(appId: string, automationId: string, task: any): Promise { +export async function doInAutomationContext( + appId: string, + automationId: string, + task: any +): Promise { const tenantId = getTenantIDFromAppID(appId) return newContext( { tenantId, appId, - automationId + automationId, }, task ) diff --git a/packages/backend-core/src/queue/listeners.ts b/packages/backend-core/src/queue/listeners.ts index fd59bec911..6732bfaaa9 100644 --- a/packages/backend-core/src/queue/listeners.ts +++ b/packages/backend-core/src/queue/listeners.ts @@ -36,8 +36,8 @@ function getLogParams( eventType: QueueEventType, event: BullEvent, opts: { - job?: Job, - jobId?: JobId, + job?: Job + jobId?: JobId error?: Error } = {}, extra: any = {} @@ -50,32 +50,32 @@ function getLogParams( event, job: opts.job, jobId: opts.jobId || opts.job?.id, - ...extra + ...extra, } return [message, err, data] } enum BullEvent { - ERROR="error", - WAITING="waiting", - ACTIVE="active", - STALLED="stalled", - PROGRESS="progress", - COMPLETED="completed", - FAILED="failed", - PAUSED="paused", - RESUMED="resumed", - CLEANED="cleaned", - DRAINED="drained", - REMOVED="removed", + ERROR = "error", + WAITING = "waiting", + ACTIVE = "active", + STALLED = "stalled", + PROGRESS = "progress", + COMPLETED = "completed", + FAILED = "failed", + PAUSED = "paused", + RESUMED = "resumed", + CLEANED = "cleaned", + DRAINED = "drained", + REMOVED = "removed", } enum QueueEventType { - AUTOMATION_EVENT="automation-event", - APP_BACKUP_EVENT="app-backup-event", - AUDIT_LOG_EVENT="audit-log-event", - SYSTEM_EVENT="system-event" + AUTOMATION_EVENT = "automation-event", + APP_BACKUP_EVENT = "app-backup-event", + AUDIT_LOG_EVENT = "audit-log-event", + SYSTEM_EVENT = "system-event", } const EventTypeMap: { [key in JobQueue]: QueueEventType } = { @@ -126,19 +126,30 @@ function logging(queue: Queue, jobQueue: JobQueue) { .on(BullEvent.PROGRESS, async (job: Job, progress: any) => { // A job's progress was updated await doInJobContext(job, () => { - console.info(...getLogParams(eventType, BullEvent.PROGRESS, { job }, { progress })) + console.info( + ...getLogParams( + eventType, + BullEvent.PROGRESS, + { job }, + { progress } + ) + ) }) }) .on(BullEvent.COMPLETED, async (job: Job, result) => { // A job successfully completed with a `result`. await doInJobContext(job, () => { - console.info(...getLogParams(eventType, BullEvent.COMPLETED, { job }, { result })) + console.info( + ...getLogParams(eventType, BullEvent.COMPLETED, { job }, { result }) + ) }) }) .on(BullEvent.FAILED, async (job: Job, error: any) => { // A job failed with reason `err`! await doInJobContext(job, () => { - console.error(...getLogParams(eventType, BullEvent.FAILED, { job, error })) + console.error( + ...getLogParams(eventType, BullEvent.FAILED, { job, error }) + ) }) }) .on(BullEvent.PAUSED, () => { @@ -152,15 +163,22 @@ function logging(queue: Queue, jobQueue: JobQueue) { .on(BullEvent.CLEANED, (jobs: Job[], type: string) => { // Old jobs have been cleaned from the queue. `jobs` is an array of cleaned // jobs, and `type` is the type of jobs cleaned. - console.info(...getLogParams(eventType, BullEvent.CLEANED, {}, { length: jobs.length, type } )) + console.info( + ...getLogParams( + eventType, + BullEvent.CLEANED, + {}, + { length: jobs.length, type } + ) + ) }) .on(BullEvent.DRAINED, () => { // Emitted every time the queue has processed all the waiting jobs (even if there can be some delayed jobs not yet processed) - console.info(...getLogParams(eventType, BullEvent.DRAINED )) + console.info(...getLogParams(eventType, BullEvent.DRAINED)) }) .on(BullEvent.REMOVED, (job: Job) => { // A job successfully removed. - console.info(...getLogParams(eventType, BullEvent.REMOVED, { job } )) + console.info(...getLogParams(eventType, BullEvent.REMOVED, { job })) }) } } diff --git a/packages/pro/node_modules/console-control-strings/README.md~ b/packages/pro/node_modules/console-control-strings/README.md~ new file mode 100644 index 0000000000..6eb34e89d1 --- /dev/null +++ b/packages/pro/node_modules/console-control-strings/README.md~ @@ -0,0 +1,140 @@ +# Console Control Strings + +A library of cross-platform tested terminal/console command strings for +doing things like color and cursor positioning. This is a subset of both +ansi and vt100. All control codes included work on both Windows & Unix-like +OSes, except where noted. + +## Usage + +```js +var consoleControl = require('console-control-strings') + +console.log(consoleControl.color('blue','bgRed', 'bold') + 'hi there' + consoleControl.color('reset')) +process.stdout.write(consoleControl.goto(75, 10)) +``` + +## Why Another? + +There are tons of libraries similar to this one. I wanted one that was: + +1. Very clear about compatibility goals. +2. Could emit, for instance, a start color code without an end one. +3. Returned strings w/o writing to streams. +4. Was not weighed down with other unrelated baggage. + +## Functions + +### var code = consoleControl.up(_num = 1_) + +Returns the escape sequence to move _num_ lines up. + +### var code = consoleControl.down(_num = 1_) + +Returns the escape sequence to move _num_ lines down. + +### var code = consoleControl.forward(_num = 1_) + +Returns the escape sequence to move _num_ lines righ. + +### var code = consoleControl.back(_num = 1_) + +Returns the escape sequence to move _num_ lines left. + +### var code = consoleControl.nextLine(_num = 1_) + +Returns the escape sequence to move _num_ lines down and to the beginning of +the line. + +### var code = consoleControl.previousLine(_num = 1_) + +Returns the escape sequence to move _num_ lines up and to the beginning of +the line. + +### var code = consoleControl.eraseData() + +Returns the escape sequence to erase everything from the current cursor +position to the bottom right of the screen. This is line based, so it +erases the remainder of the current line and all following lines. + +### var code = consoleControl.eraseLine() + +Returns the escape sequence to erase to the end of the current line. + +### var code = consoleControl.goto(_x_, _y_) + +Returns the escape sequence to move the cursor to the designated position. +Note that the origin is _1, 1_ not _0, 0_. + +### var code = consoleControl.gotoSOL() + +Returns the escape sequence to move the cursor to the beginning of the +current line. (That is, it returns a carriage return, `\r`.) + +### var code = consoleControl.hideCursor() + +Returns the escape sequence to hide the cursor. + +### var code = consoleControl.showCursor() + +Returns the escape sequence to show the cursor. + +### var code = consoleControl.color(_colors = []_) + +### var code = consoleControl.color(_color1_, _color2_, _…_, _colorn_) + +Returns the escape sequence to set the current terminal display attributes +(mostly colors). Arguments can either be a list of attributes or an array +of attributes. The difference between passing in an array or list of colors +and calling `.color` separately for each one, is that in the former case a +single escape sequence will be produced where as in the latter each change +will have its own distinct escape sequence. Each attribute can be one of: + +* Reset: + * **reset** – Reset all attributes to the terminal default. +* Styles: + * **bold** – Display text as bold. In some terminals this means using a + bold font, in others this means changing the color. In some it means + both. + * **italic** – Display text as italic. This is not available in most Windows terminals. + * **underline** – Underline text. This is not available in most Windows Terminals. + * **inverse** – Invert the foreground and background colors. + * **stopBold** – Do not display text as bold. + * **stopItalic** – Do not display text as italic. + * **stopUnderline** – Do not underline text. + * **stopInverse** – Do not invert foreground and background. +* Colors: + * **white** + * **black** + * **blue** + * **cyan** + * **green** + * **magenta** + * **red** + * **yellow** + * **grey** / **brightBlack** + * **brightRed** + * **brightGreen** + * **brightYellow** + * **brightBlue** + * **brightMagenta** + * **brightCyan** + * **brightWhite** +* Background Colors: + * **bgWhite** + * **bgBlack** + * **bgBlue** + * **bgCyan** + * **bgGreen** + * **bgMagenta** + * **bgRed** + * **bgYellow** + * **bgGrey** / **bgBrightBlack** + * **bgBrightRed** + * **bgBrightGreen** + * **bgBrightYellow** + * **bgBrightBlue** + * **bgBrightMagenta** + * **bgBrightCyan** + * **bgBrightWhite** + diff --git a/packages/pro/node_modules/copy-concurrently/README.md~ b/packages/pro/node_modules/copy-concurrently/README.md~ new file mode 100644 index 0000000000..7f93b2ad26 --- /dev/null +++ b/packages/pro/node_modules/copy-concurrently/README.md~ @@ -0,0 +1,127 @@ +# copy-concurrently + +Copy files, directories and symlinks + +``` +const copy = require('copy-concurrently') +copy('/path/to/thing', '/new/path/thing').then(() => { + // this is now copied +}).catch(err => { + // oh noooo +}) +``` + +Copies files, directories and symlinks. Ownership is maintained when +running as root, permissions are always maintained. On Windows, if symlinks +are unavailable then junctions will be used. + +## PUBLIC INTERFACE + +### copy(from, to, [options]) → Promise + +Recursively copies `from` to `to` and resolves its promise when finished. +If `to` already exists then the promise will be rejected with an `EEXIST` +error. + +Options are: + +* maxConcurrency – (Default: `1`) The maximum number of concurrent copies to do at once. +* recurseWith - (Default: `copy.item`) The function to call on each file after recursing into a directory. +* isWindows - (Default: `process.platform === 'win32'`) If true enables Windows symlink semantics. This requires + an extra `stat` to determine if the destination of a symlink is a file or directory. If symlinking a directory + fails then we'll try making a junction instead. + +Options can also include dependency injection: + +* Promise - (Default: `global.Promise`) The promise implementation to use, defaults to Node's. +* fs - (Default: `require('fs')`) The filesystem module to use. Can be used + to use `graceful-fs` or to inject a mock. +* writeStreamAtomic - (Default: `require('fs-write-stream-atomic')`) The + implementation of `writeStreamAtomic` to use. Used to inject a mock. +* getuid - (Default: `process.getuid`) A function that returns the current UID. Used to inject a mock. + +## EXTENSION INTERFACE + +Ordinarily you'd only call `copy` above. But it's possible to use it's +component functions directly. This is useful if, say, you're writing +[move-concurently](https://npmjs.com/package/move-concurrently). + +### copy.file(from, to, options) → Promise + +Copies a ordinary file `from` to destination `to`. Uses +`fs-write-stream-atomic` to ensure that the file is entirely copied or not +at all. + +Options are: + +* uid, gid - (Optional) If `getuid()` is `0` then this and gid will be used to + set the user and group of `to`. If uid is present then gid must be too. +* mode - (Optional) If set then `to` will have its perms set to `mode`. +* fs - (Default: `require('fs')`) The filesystem module to use. Can be used + to use `graceful-fs` or to inject a mock. +* Promise - (Default: `global.Promise`) The promise implementation to use, defaults to Node's. +* writeStreamAtomic - (Default `require('fs-write-stream-atomic')`) The + implementation of `writeStreamAtomic` to use. Used to inject a mock. + +### copy.symlink(from, to, options) → Promise + +Copies a symlink `from` to destination `to`. If on Windows then if +symlinking fails, a junction will be used instead. + +Options are: + +* top - The top level the copy is being run from. This is used to determine + if the symlink destination is within the set of files we're copying or + outside it. +* fs - (Default: `require('fs')`) The filesystem module to use. Can be used + to use `graceful-fs` or to inject a mock. +* Promise - (Default: `global.Promise`) The promise implementation to use, defaults to Node's. +* isWindows - (Default: `process.platform === 'win32'`) If true enables Windows symlink semantics. This requires + an extra `stat` to determine if the destination of a symlink is a file or directory. If symlinking a directory + fails then we'll try making a junction instead. + +### copy.recurse(from, to, options) → Promise + +Reads all of the files in directory `from` and adds them to the `queue` +using `recurseWith` (by default `copy.item`). + +Options are: + +* queue - A [`run-queue`](https://npmjs.com/package/run-queue) object to add files found inside `from` to. +* recurseWith - (Default: `copy.item`) The function to call on each file after recursing into a directory. +* uid, gid - (Optional) If `getuid()` is `0` then this and gid will be used to + set the user and group of `to`. If uid is present then gid must be too. +* mode - (Optional) If set then `to` will have its perms set to `mode`. +* fs - (Default: `require('fs')`) The filesystem module to use. Can be used + to use `graceful-fs` or to inject a mock. +* getuid - (Default: `process.getuid`) A function that returns the current UID. Used to inject a mock. + +### copy.item(from, to, options) → Promise + +Copies some kind of `from` to destination `to`. This looks at the filetype +and calls `copy.file`, `copy.symlink` or `copy.recurse` as appropriate. + +Symlink copies are queued with a priority such that they happen after all +file and directory copies as you can't create a junction on windows to a +file that doesn't exist yet. + +Options are: + +* top - The top level the copy is being run from. This is used to determine + if the symlink destination is within the set of files we're copying or + outside it. +* queue - The [`run-queue`](https://npmjs.com/package/run-queue) object to + pass to `copy.recurse` if `from` is a directory. +* recurseWith - (Default: `copy.item`) The function to call on each file after recursing into a directory. +* uid, gid - (Optional) If `getuid()` is `0` then this and gid will be used to + set the user and group of `to`. If uid is present then gid must be too. +* mode - (Optional) If set then `to` will have its perms set to `mode`. +* fs - (Default: `require('fs')`) The filesystem module to use. Can be used + to use `graceful-fs` or to inject a mock. +* getuid - (Default: `process.getuid`) A function that returns the current UID. Used to inject a mock. +* isWindows - (Default: `process.platform === 'win32'`) If true enables Windows symlink semantics. This requires + an extra `stat` to determine if the destination of a symlink is a file or directory. If symlinking a directory + fails then we'll try making a junction instead. +* Promise - (Default: `global.Promise`) The promise implementation to use, defaults to Node's. +* writeStreamAtomic - (Default `require('fs-write-stream-atomic')`) The + implementation of `writeStreamAtomic` to use. Used to inject a mock. diff --git a/packages/pro/node_modules/move-concurrently/README.md~ b/packages/pro/node_modules/move-concurrently/README.md~ new file mode 100644 index 0000000000..7d04d45955 --- /dev/null +++ b/packages/pro/node_modules/move-concurrently/README.md~ @@ -0,0 +1,52 @@ +# move-concurrently + +Move files and directories. + +``` +const move = require('move-concurrently') +move('/path/to/thing', '/new/path/thing'), err => { + if (err) throw err + // thing is now moved! +}) +``` + +Uses `rename` to move things as fast as possible. + +If you `move` across devices or on filesystems that don't support renaming +large directories. That is, situations that result in `rename` returning +the `EXDEV` error, then `move` will fallback to copy + delete. + +When recursively copying directories it will first try to rename the +contents before falling back to copying. While this will be slightly slower +in true cross-device scenarios, it is MUCH faster in cases where the +filesystem can't handle directory renames. + +When copying ownership is maintained when running as root. Permissions are +always maintained. On Windows, if symlinks are unavailable then junctions +will be used. + +## INTERFACE + +### move(from, to, options) → Promise + +Recursively moves `from` to `to` and resolves its promise when finished. +If `to` already exists then the promise will be rejected with an `EEXIST` +error. + +Starts by trying to rename `from` to `to`. + +Options are: + +* maxConcurrency – (Default: `1`) The maximum number of concurrent copies to do at once. +* isWindows - (Default: `process.platform === 'win32'`) If true enables Windows symlink semantics. This requires + an extra `stat` to determine if the destination of a symlink is a file or directory. If symlinking a directory + fails then we'll try making a junction instead. + +Options can also include dependency injection: + +* Promise - (Default: `global.Promise`) The promise implementation to use, defaults to Node's. +* fs - (Default: `require('fs')`) The filesystem module to use. Can be used + to use `graceful-fs` or to inject a mock. +* writeStreamAtomic - (Default: `require('fs-write-stream-atomic')`) The + implementation of `writeStreamAtomic` to use. Used to inject a mock. +* getuid - (Default: `process.getuid`) A function that returns the current UID. Used to inject a mock. diff --git a/packages/pro/node_modules/umask/index.js~ b/packages/pro/node_modules/umask/index.js~ new file mode 100644 index 0000000000..87738e4a10 --- /dev/null +++ b/packages/pro/node_modules/umask/index.js~ @@ -0,0 +1,68 @@ +// commands for handling umask + +var util = require("util") +var log = require("npmlog") + +var defaultUmask = 0022 +var defaultUmaskString = toString(defaultUmask) + +exports.toString = toString +exports.fromString = fromString +exports.validate = validate + +function toString(val) { + val = val.toString(8) + while (val.length < 4) val = "0" + val + return val +} + +function validate (data, k, val) { + // must be either an integer or an octal string. + if (typeof val === "number") { + data[k] = val + return true + } + + if (typeof val === "string") { + if (val.charAt(0) !== "0" || isNaN(val)) return false + data[k] = parseInt(val, 8) + return true + } + + return false +} + +function fromString(val, cb) { + + // synchronous callback, no zalgo + _fromString(val, cb || function (err, result) { + + if (err) log.warn("invalid umask", err.message) + val = result + }) + + return val +} + +function _fromString(val, cb) { + if(typeof val === "string") { + if (!/^[0-7]+$/.test(val)) { + return cb(new Error(util.format("Expected octal string, got %j, defaulting to %j", + val, defaultUmaskString)), + defaultUmask) + } + + val = parseInt(val, 8) + } else if(typeof val !== "number") { + return cb(new Error(util.format("Expected number or octal string, got %j, defaulting to %j", + val, defaultUmaskString)), + defaultUmask) + } + + if ((val < 0) || (val > 511)) { + return cb(new Error(util.format("Must be in range 0..511 (0000..0777), got %j", val)), + defaultUmask) + } + + cb(null, val) +} \ No newline at end of file diff --git a/packages/pro/node_modules/umask/test/ChangeLog~ b/packages/pro/node_modules/umask/test/ChangeLog~ new file mode 100644 index 0000000000..72ade111ec --- /dev/null +++ b/packages/pro/node_modules/umask/test/ChangeLog~ @@ -0,0 +1,5 @@ +2015-01-15 Sam Mikes + + * index.js: (convert_fromString) accept decimal strings provided they + don't begin with '0' + diff --git a/packages/pro/node_modules/umask/test/simple.js~ b/packages/pro/node_modules/umask/test/simple.js~ new file mode 100644 index 0000000000..a2184c3cd4 --- /dev/null +++ b/packages/pro/node_modules/umask/test/simple.js~ @@ -0,0 +1,14 @@ +'use strict'; + +var Purefts = require('..'); + +var Code = require('code'); +var Lab = require('lab'); +var lab = Lab.script(); +exports.lab = lab; + +var describe = lab.describe; +var it = lab.it; +var expect = Code.expect; + +describe('create objects', function () { diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts index 50c9b77818..50a3af2cbb 100644 --- a/packages/server/src/automations/utils.ts +++ b/packages/server/src/automations/utils.ts @@ -19,7 +19,7 @@ const Runner = new Thread(ThreadType.AUTOMATION) function loggingArgs(job: AutomationJob) { return { jobId: job.id, - trigger: job.data.automation.definition.trigger.event + trigger: job.data.automation.definition.trigger.event, } } diff --git a/packages/server/src/definitions/automations.ts b/packages/server/src/definitions/automations.ts index d7a7b42095..7e86608bf3 100644 --- a/packages/server/src/definitions/automations.ts +++ b/packages/server/src/definitions/automations.ts @@ -27,4 +27,3 @@ export interface AutomationContext extends AutomationResults { env?: Record trigger: any } - diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts index 6bfb6afc25..e271ebba0b 100644 --- a/packages/server/src/threads/automation.ts +++ b/packages/server/src/threads/automation.ts @@ -13,7 +13,13 @@ import { generateAutomationMetadataID, isProdAppID } from "../db/utils" import { definitions as triggerDefs } from "../automations/triggerInfo" import { AutomationErrors, MAX_AUTOMATION_RECURRING_ERRORS } from "../constants" import { storeLog } from "../automations/logging" -import { Automation, AutomationStep, AutomationStatus, AutomationMetadata, AutomationJob } from "@budibase/types" +import { + Automation, + AutomationStep, + AutomationStatus, + AutomationMetadata, + AutomationJob, +} from "@budibase/types" import { LoopStep, LoopInput, diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts index f726e70b21..07d4654433 100644 --- a/packages/types/src/documents/app/automation.ts +++ b/packages/types/src/documents/app/automation.ts @@ -181,4 +181,4 @@ export type AutomationStepInput = { export interface AutomationMetadata extends Document { errorCount?: number automationChainCount?: number -} \ No newline at end of file +} diff --git a/packages/types/src/sdk/automations/index.ts b/packages/types/src/sdk/automations/index.ts index 1025220791..f1e3d38101 100644 --- a/packages/types/src/sdk/automations/index.ts +++ b/packages/types/src/sdk/automations/index.ts @@ -12,4 +12,4 @@ export interface AutomationData { automation: Automation } -export type AutomationJob = Job \ No newline at end of file +export type AutomationJob = Job From 6c412c7cd914f1a77bc32616dfe3478cd1b278d1 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 17 May 2023 14:22:23 +0100 Subject: [PATCH 482/521] Test fix --- packages/backend-core/src/queue/inMemoryQueue.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend-core/src/queue/inMemoryQueue.ts b/packages/backend-core/src/queue/inMemoryQueue.ts index b80aece418..ec1d9d4a90 100644 --- a/packages/backend-core/src/queue/inMemoryQueue.ts +++ b/packages/backend-core/src/queue/inMemoryQueue.ts @@ -128,6 +128,7 @@ class InMemoryQueue { on() { // do nothing + return this } async waitForCompletion() { From e06d0c91f21b4334287bd54df78c6f115efbe4d7 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 17 May 2023 15:47:33 +0200 Subject: [PATCH 483/521] Update checkout action --- .github/workflows/budibase_ci.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index d05497c3a8..1f9e640b51 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -22,7 +22,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js 14.x uses: actions/setup-node@v3 with: @@ -34,7 +34,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} @@ -49,7 +49,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} @@ -61,6 +61,9 @@ jobs: - run: yarn - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core --scope=@budibase/string-templates - run: yarn test --ignore=@budibase/pro + env: + JEST_MAX_WORKERS: ${{ steps.cpu-cores.outputs.count }} + - uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos @@ -70,7 +73,7 @@ jobs: test-pro: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} @@ -86,7 +89,7 @@ jobs: integration-test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} @@ -110,7 +113,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} From d5439e1fb6961003d3523d2734442835556e6b1d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 17 May 2023 13:51:09 +0000 Subject: [PATCH 484/521] Bump version to 2.6.16-alpha.5 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 45abc9671f..c9f5201e0d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.16-alpha.4", + "version": "2.6.16-alpha.5", "npmClient": "yarn", "packages": [ "packages/backend-core", From f41b134d315b992a1118d1445ed0304fe4dfee8e Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 17 May 2023 14:57:29 +0100 Subject: [PATCH 485/521] Refactor to use param for doInAutomationContext --- packages/backend-core/src/context/mainContext.ts | 12 ++++++------ packages/server/src/automations/utils.ts | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts index 492e0abb10..41e6579384 100644 --- a/packages/backend-core/src/context/mainContext.ts +++ b/packages/backend-core/src/context/mainContext.ts @@ -104,19 +104,19 @@ async function newContext(updates: ContextMap, task: any) { return Context.run(context, task) } -export async function doInAutomationContext( +export async function doInAutomationContext(params: { appId: string, automationId: string, task: any -): Promise { - const tenantId = getTenantIDFromAppID(appId) +}): Promise { + const tenantId = getTenantIDFromAppID(params.appId) return newContext( { tenantId, - appId, - automationId, + appId: params.appId, + automationId: params.automationId, }, - task + params.task ) } diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts index 50a3af2cbb..d9f19013ee 100644 --- a/packages/server/src/automations/utils.ts +++ b/packages/server/src/automations/utils.ts @@ -26,7 +26,7 @@ function loggingArgs(job: AutomationJob) { export async function processEvent(job: AutomationJob) { const appId = job.data.event.appId! const automationId = job.data.automation._id! - return await context.doInAutomationContext(appId, automationId, async () => { + const task = async () => { try { // need to actually await these so that an error can be captured properly console.log("automation running", loggingArgs(job)) @@ -41,7 +41,9 @@ export async function processEvent(job: AutomationJob) { console.error(`automation was unable to run`, err, loggingArgs(job)) return { err } } - }) + } + + return await context.doInAutomationContext({ appId, automationId, task }) } export async function updateTestHistory( From 78daed6ec1e956cdb042b423fe884be52615c61b Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 17 May 2023 15:31:14 +0100 Subject: [PATCH 486/521] Lint --- packages/backend-core/src/context/mainContext.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts index 41e6579384..61d96bb4b0 100644 --- a/packages/backend-core/src/context/mainContext.ts +++ b/packages/backend-core/src/context/mainContext.ts @@ -105,8 +105,8 @@ async function newContext(updates: ContextMap, task: any) { } export async function doInAutomationContext(params: { - appId: string, - automationId: string, + appId: string + automationId: string task: any }): Promise { const tenantId = getTenantIDFromAppID(params.appId) From e4835d5f917a543cf559e5a6bc0312085c0ebefb Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 17 May 2023 14:39:18 +0000 Subject: [PATCH 487/521] v2.6.17 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 643023f2b1..3efa044add 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.16", + "version": "2.6.17", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 94b9e9e745..9cbb2f0cc9 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.16", + "version": "2.6.17", "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.6.16", + "@budibase/types": "^2.6.17", "@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 a27fe96ebf..6a01ebe616 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.6.16", + "version": "2.6.17", "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.6.16", - "@budibase/string-templates": "^2.6.16", + "@budibase/shared-core": "^2.6.17", + "@budibase/string-templates": "^2.6.17", "@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 a0a14498f6..315ece71c8 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.16", + "version": "2.6.17", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.16", - "@budibase/frontend-core": "^2.6.16", - "@budibase/shared-core": "^2.6.16", - "@budibase/string-templates": "^2.6.16", + "@budibase/bbui": "^2.6.17", + "@budibase/frontend-core": "^2.6.17", + "@budibase/shared-core": "^2.6.17", + "@budibase/string-templates": "^2.6.17", "@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 ed843dc18e..720aa6af7b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.16", + "version": "2.6.17", "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.6.16", - "@budibase/string-templates": "^2.6.16", - "@budibase/types": "^2.6.16", + "@budibase/backend-core": "^2.6.17", + "@budibase/string-templates": "^2.6.17", + "@budibase/types": "^2.6.17", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 0871d05302..a85cc1d613 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.16", + "version": "2.6.17", "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.6.16", - "@budibase/frontend-core": "^2.6.16", - "@budibase/shared-core": "^2.6.16", - "@budibase/string-templates": "^2.6.16", - "@budibase/types": "^2.6.16", + "@budibase/bbui": "^2.6.17", + "@budibase/frontend-core": "^2.6.17", + "@budibase/shared-core": "^2.6.17", + "@budibase/string-templates": "^2.6.17", + "@budibase/types": "^2.6.17", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index b2053a8fa0..569d4fcf8c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.16", + "version": "2.6.17", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.6.16", - "@budibase/shared-core": "^2.6.16", + "@budibase/bbui": "^2.6.17", + "@budibase/shared-core": "^2.6.17", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 41a02e71a9..a51e825987 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.16", + "version": "2.6.17", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9f6c33f0e2..80a7159650 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.16", + "version": "2.6.17", "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.6.16", - "@budibase/client": "^2.6.16", + "@budibase/backend-core": "^2.6.17", + "@budibase/client": "^2.6.17", "@budibase/pro": "2.6.16", - "@budibase/shared-core": "^2.6.16", - "@budibase/string-templates": "^2.6.16", - "@budibase/types": "^2.6.16", + "@budibase/shared-core": "^2.6.17", + "@budibase/string-templates": "^2.6.17", + "@budibase/types": "^2.6.17", "@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 b69e8105e6..e82cc467bf 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.16", + "version": "2.6.17", "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.6.16" + "@budibase/types": "^2.6.17" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 79ffb2b0e4..419417a8c8 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.16", + "version": "2.6.17", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index db3bc658d4..570c3e764e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.16", + "version": "2.6.17", "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 a2a4ebafaf..2709951668 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.16", + "version": "2.6.17", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.6.16", + "@budibase/backend-core": "^2.6.17", "@budibase/pro": "2.6.16", - "@budibase/string-templates": "^2.6.16", - "@budibase/types": "^2.6.16", + "@budibase/string-templates": "^2.6.17", + "@budibase/types": "^2.6.17", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d84284db2884f4636871f6425786dcd04258ed86 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 17 May 2023 14:40:47 +0000 Subject: [PATCH 488/521] Update pro version to 2.6.17 --- 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 80a7159650..3a755ab84c 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.6.17", "@budibase/client": "^2.6.17", - "@budibase/pro": "2.6.16", + "@budibase/pro": "2.6.17", "@budibase/shared-core": "^2.6.17", "@budibase/string-templates": "^2.6.17", "@budibase/types": "^2.6.17", diff --git a/packages/worker/package.json b/packages/worker/package.json index 2709951668..b3bbdbd2a3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.17", - "@budibase/pro": "2.6.16", + "@budibase/pro": "2.6.17", "@budibase/string-templates": "^2.6.17", "@budibase/types": "^2.6.17", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 6d606cb461..52fbdb4712 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.15": - version "2.6.15" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.15.tgz#527a0e6fe85d0413382433a23b0342d77670db1d" - integrity sha512-oXssIt4VvFEde8ftRnk7XPYMOXI/E7YN8GseSyhAxzozPYdGatd1AyqnBAJFgrYtAwQCLQOZBJFWRWhCpCCPhA== +"@budibase/pro@2.6.16": + version "2.6.16" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.16.tgz#c861c68787e8b85a28dcfe9bfe7f96225e493069" + integrity sha512-mmxfZe5eiqQMYlmVT9+t2NiWd9Cpy2Z0VBE6nPgv98lHNZTcA1S6Msb+PV/24FEzSFnE0IHQlEsgYFJi5lLXlg== dependencies: - "@budibase/backend-core" "2.6.15" + "@budibase/backend-core" "2.6.16" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.15" + "@budibase/types" "2.6.16" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 26201a9d76e7b98d74d5a5beabd60d603030e1f8 Mon Sep 17 00:00:00 2001 From: andz-bb Date: Wed, 17 May 2023 16:14:50 +0100 Subject: [PATCH 489/521] hotfix for time-only date picker problems (reverting flatpickr to previous version) --- packages/bbui/package.json | 2 +- yarn.lock | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6a01ebe616..eddcd2381d 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -84,7 +84,7 @@ "@spectrum-css/vars": "3.0.1", "dayjs": "^1.10.4", "easymde": "^2.16.1", - "svelte-flatpickr": "^3.3.2", + "svelte-flatpickr": "3.2.3", "svelte-portal": "^1.0.0" }, "resolutions": { diff --git a/yarn.lock b/yarn.lock index 52fbdb4712..4eaf610f15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.16": - version "2.6.16" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.16.tgz#c861c68787e8b85a28dcfe9bfe7f96225e493069" - integrity sha512-mmxfZe5eiqQMYlmVT9+t2NiWd9Cpy2Z0VBE6nPgv98lHNZTcA1S6Msb+PV/24FEzSFnE0IHQlEsgYFJi5lLXlg== +"@budibase/pro@2.6.17": + version "2.6.17" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.17.tgz#1f238370d2aa92a650e35798a3b00c5c0aadf1ad" + integrity sha512-WWvgicSlqkYpx0cNbAhYi/W/CjIQyjzS7We7aXncwHtWWJIeYfItmxxZsX7aPOEYygG7650wCA/+j57oKfzYmA== dependencies: - "@budibase/backend-core" "2.6.16" + "@budibase/backend-core" "2.6.17" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.16" + "@budibase/types" "2.6.17" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -22952,7 +22952,14 @@ svelte-dnd-action@^0.9.8: resolved "https://registry.yarnpkg.com/svelte-dnd-action/-/svelte-dnd-action-0.9.22.tgz#003eee9dddb31d8c782f6832aec8b1507fff194d" integrity sha512-lOQJsNLM1QWv5mdxIkCVtk6k4lHCtLgfE59y8rs7iOM6erchbLC9hMEFYSveZz7biJV0mpg7yDSs4bj/RT/YkA== -svelte-flatpickr@^3.1.0, svelte-flatpickr@^3.2.3, svelte-flatpickr@^3.3.2: +svelte-flatpickr@3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.2.3.tgz#db5dd7ad832ef83262b45e09737955ad3d591fc8" + integrity sha512-PNkqK4Napx8nTvCwkaUXdnKo8dISThaxEOK+szTUXcY6H0dQM0TSyuoMaVWY2yX7pM+PN5cpCQCcVe8YvTRFSw== + dependencies: + flatpickr "^4.5.2" + +svelte-flatpickr@^3.1.0, svelte-flatpickr@^3.2.3: version "3.3.2" resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.3.2.tgz#f08bcde83d439cb30df6fd07b974d87371f130c1" integrity sha512-VNJLYyLRDplI63oWX5hJylzAJc2VhTh3z9SNecfjtuPZmP6FZPpg9Fw7rXpkEV2DPovIWj2PtaVxB6Kp9r423w== From 30dd224a34da17bb4219b57418e3a696419dc7cd Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 17 May 2023 16:13:35 +0000 Subject: [PATCH 490/521] v2.6.18 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 3efa044add..81677cb994 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.17", + "version": "2.6.18", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 9cbb2f0cc9..c48e11efc1 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.17", + "version": "2.6.18", "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.6.17", + "@budibase/types": "^2.6.18", "@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 eddcd2381d..3ab8642bc7 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.6.17", + "version": "2.6.18", "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.6.17", - "@budibase/string-templates": "^2.6.17", + "@budibase/shared-core": "^2.6.18", + "@budibase/string-templates": "^2.6.18", "@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 315ece71c8..07712b6f3b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.17", + "version": "2.6.18", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.17", - "@budibase/frontend-core": "^2.6.17", - "@budibase/shared-core": "^2.6.17", - "@budibase/string-templates": "^2.6.17", + "@budibase/bbui": "^2.6.18", + "@budibase/frontend-core": "^2.6.18", + "@budibase/shared-core": "^2.6.18", + "@budibase/string-templates": "^2.6.18", "@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 720aa6af7b..38c51d80b9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.17", + "version": "2.6.18", "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.6.17", - "@budibase/string-templates": "^2.6.17", - "@budibase/types": "^2.6.17", + "@budibase/backend-core": "^2.6.18", + "@budibase/string-templates": "^2.6.18", + "@budibase/types": "^2.6.18", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index a85cc1d613..affca2cf28 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.17", + "version": "2.6.18", "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.6.17", - "@budibase/frontend-core": "^2.6.17", - "@budibase/shared-core": "^2.6.17", - "@budibase/string-templates": "^2.6.17", - "@budibase/types": "^2.6.17", + "@budibase/bbui": "^2.6.18", + "@budibase/frontend-core": "^2.6.18", + "@budibase/shared-core": "^2.6.18", + "@budibase/string-templates": "^2.6.18", + "@budibase/types": "^2.6.18", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 569d4fcf8c..fb45a88805 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.17", + "version": "2.6.18", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.6.17", - "@budibase/shared-core": "^2.6.17", + "@budibase/bbui": "^2.6.18", + "@budibase/shared-core": "^2.6.18", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a51e825987..7d6461c3e5 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.17", + "version": "2.6.18", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 3a755ab84c..56f75a7b1f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.17", + "version": "2.6.18", "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.6.17", - "@budibase/client": "^2.6.17", + "@budibase/backend-core": "^2.6.18", + "@budibase/client": "^2.6.18", "@budibase/pro": "2.6.17", - "@budibase/shared-core": "^2.6.17", - "@budibase/string-templates": "^2.6.17", - "@budibase/types": "^2.6.17", + "@budibase/shared-core": "^2.6.18", + "@budibase/string-templates": "^2.6.18", + "@budibase/types": "^2.6.18", "@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 e82cc467bf..d9d7d4ab31 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.17", + "version": "2.6.18", "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.6.17" + "@budibase/types": "^2.6.18" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 419417a8c8..30c67b7d68 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.17", + "version": "2.6.18", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 570c3e764e..487f5b9767 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.17", + "version": "2.6.18", "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 b3bbdbd2a3..e25230266c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.17", + "version": "2.6.18", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.6.17", + "@budibase/backend-core": "^2.6.18", "@budibase/pro": "2.6.17", - "@budibase/string-templates": "^2.6.17", - "@budibase/types": "^2.6.17", + "@budibase/string-templates": "^2.6.18", + "@budibase/types": "^2.6.18", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 0595b4485e1ca166226f7f17bbd6167b31bb0769 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 17 May 2023 16:15:07 +0000 Subject: [PATCH 491/521] Update pro version to 2.6.18 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 56f75a7b1f..e1afcafac0 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.6.18", "@budibase/client": "^2.6.18", - "@budibase/pro": "2.6.17", + "@budibase/pro": "2.6.18", "@budibase/shared-core": "^2.6.18", "@budibase/string-templates": "^2.6.18", "@budibase/types": "^2.6.18", diff --git a/packages/worker/package.json b/packages/worker/package.json index e25230266c..9a82edfb4e 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.18", - "@budibase/pro": "2.6.17", + "@budibase/pro": "2.6.18", "@budibase/string-templates": "^2.6.18", "@budibase/types": "^2.6.18", "@koa/router": "8.0.8", From eff22c4e74b251f6062dc973c2fb22de440f4a9c Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Wed, 17 May 2023 21:32:50 +0100 Subject: [PATCH 492/521] Remove type casting any from test methods --- packages/types/src/documents/app/screen.ts | 1 + qa-core/src/internal-api/api/apis/AppAPI.ts | 14 ++++---- .../internal-api/api/apis/DatasourcesAPI.ts | 31 ++++-------------- .../src/internal-api/api/apis/QueriesAPI.ts | 4 +-- qa-core/src/internal-api/api/apis/RowAPI.ts | 8 ++--- .../src/internal-api/api/apis/ScreenAPI.ts | 5 +-- .../src/internal-api/fixtures/datasources.ts | 9 +++--- qa-core/src/internal-api/fixtures/queries.ts | 2 +- qa-core/src/internal-api/fixtures/screens.ts | 4 +-- .../tests/dataSources/mariaDB.spec.ts | 2 +- .../tests/dataSources/mongoDB.spec.ts | 2 +- .../tests/dataSources/postgresSQL.spec.ts | 2 +- .../tests/dataSources/restAPI.spec.ts | 2 +- qa-core/src/types/datasources.ts | 22 +++++++++++++ qa-core/src/types/index.ts | 4 +-- qa-core/src/types/screens.ts | 32 +++++++++++++++++++ 16 files changed, 92 insertions(+), 52 deletions(-) create mode 100644 qa-core/src/types/datasources.ts create mode 100644 qa-core/src/types/screens.ts diff --git a/packages/types/src/documents/app/screen.ts b/packages/types/src/documents/app/screen.ts index 5f79620ae4..58c00ef3d6 100644 --- a/packages/types/src/documents/app/screen.ts +++ b/packages/types/src/documents/app/screen.ts @@ -21,4 +21,5 @@ export interface Screen extends Document { width?: string routing: ScreenRouting props: ScreenProps + name?: string } diff --git a/qa-core/src/internal-api/api/apis/AppAPI.ts b/qa-core/src/internal-api/api/apis/AppAPI.ts index 6a7d5cd99a..a9f9a6a841 100644 --- a/qa-core/src/internal-api/api/apis/AppAPI.ts +++ b/qa-core/src/internal-api/api/apis/AppAPI.ts @@ -5,10 +5,15 @@ import { AppPackageResponse, DeployConfig, MessageResponse, + CreateAppRequest, } from "../../../types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" import BaseAPI from "./BaseAPI" +interface RenameAppBody { + name: string +} + export default class AppAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { super(client) @@ -46,7 +51,7 @@ export default class AppAPI extends BaseAPI { return [response, json] } - async create(body: any): Promise { + async create(body: CreateAppRequest): Promise { const [response, json] = await this.post(`/applications`, body) expect(json._id).toBeDefined() return json @@ -100,18 +105,13 @@ export default class AppAPI extends BaseAPI { async rename( appId: string, oldName: string, - body: any + body: RenameAppBody ): Promise<[Response, App]> { const [response, json] = await this.put(`/applications/${appId}`, body) expect(json.name).not.toEqual(oldName) return [response, json] } - async addScreentoApp(body: any): Promise<[Response, App]> { - const [response, json] = await this.post(`/screens`, body) - return [response, json] - } - async getRoutes(screenExists?: boolean): Promise<[Response, RouteConfig]> { const [response, json] = await this.get(`/routing`) if (screenExists) { diff --git a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts index 3fec8e8189..9067ed4ab4 100644 --- a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts +++ b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts @@ -6,6 +6,7 @@ import { } from "@budibase/types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" import BaseAPI from "./BaseAPI" +import { DatasourceRequest } from "../../../types" export default class DatasourcesAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { @@ -31,7 +32,9 @@ export default class DatasourcesAPI extends BaseAPI { return [response, json] } - async add(body: any): Promise<[Response, CreateDatasourceResponse]> { + async add( + body: DatasourceRequest + ): Promise<[Response, CreateDatasourceResponse]> { const [response, json] = await this.post(`/datasources`, body) expect(json.datasource._id).toBeDefined() expect(json.datasource._rev).toBeDefined() @@ -39,7 +42,9 @@ export default class DatasourcesAPI extends BaseAPI { return [response, json] } - async update(body: any): Promise<[Response, UpdateDatasourceResponse]> { + async update( + body: Datasource + ): Promise<[Response, UpdateDatasourceResponse]> { const [response, json] = await this.put(`/datasources/${body._id}`, body) expect(json.datasource._id).toBeDefined() expect(json.datasource._rev).toBeDefined() @@ -47,28 +52,6 @@ export default class DatasourcesAPI extends BaseAPI { return [response, json] } - async previewQuery(body: any): Promise<[Response, any]> { - const [response, json] = await this.post(`/queries/preview`, body) - return [response, json] - } - - async saveQuery(body: any): Promise<[Response, any]> { - const [response, json] = await this.post(`/queries`, body) - return [response, json] - } - - async getQuery(queryId: string): Promise<[Response, any]> { - const [response, json] = await this.get(`/queries/${queryId}`) - - return [response, json] - } - - async getQueryPermissions(queryId: string): Promise<[Response, any]> { - const [response, json] = await this.get(`/permissions/${queryId}`) - - return [response, json] - } - async delete(dataSourceId: string, revId: string): Promise { const [response, json] = await this.del( `/datasources/${dataSourceId}/${revId}` diff --git a/qa-core/src/internal-api/api/apis/QueriesAPI.ts b/qa-core/src/internal-api/api/apis/QueriesAPI.ts index b47c379191..e3b9d1e474 100644 --- a/qa-core/src/internal-api/api/apis/QueriesAPI.ts +++ b/qa-core/src/internal-api/api/apis/QueriesAPI.ts @@ -3,7 +3,7 @@ import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" import { PreviewQueryRequest, Query } from "@budibase/types" import BaseAPI from "./BaseAPI" -export default class DatasourcesAPI extends BaseAPI { +export default class QueriesAPI extends BaseAPI { constructor(client: BudibaseInternalAPIClient) { super(client) } @@ -18,7 +18,7 @@ export default class DatasourcesAPI extends BaseAPI { return [response, json] } - async get(queryId: string): Promise<[Response, any]> { + async getQuery(queryId: string): Promise<[Response, any]> { const [response, json] = await this.get(`/queries/${queryId}`) return [response, json] } diff --git a/qa-core/src/internal-api/api/apis/RowAPI.ts b/qa-core/src/internal-api/api/apis/RowAPI.ts index c557a22291..18c4874157 100644 --- a/qa-core/src/internal-api/api/apis/RowAPI.ts +++ b/qa-core/src/internal-api/api/apis/RowAPI.ts @@ -18,7 +18,7 @@ export default class RowAPI extends BaseAPI { } return [response, json] } - async add(tableId: string, body: any): Promise<[Response, Row]> { + async add(tableId: string, body: Row): Promise<[Response, Row]> { const [response, json] = await this.post(`/${tableId}/rows`, body) expect(json._id).toBeDefined() expect(json._rev).toBeDefined() @@ -27,7 +27,7 @@ export default class RowAPI extends BaseAPI { return [response, json] } - async delete(tableId: string, body: any): Promise<[Response, Row[]]> { + async delete(tableId: string, body: Row): Promise<[Response, Row[]]> { const [response, json] = await this.del( `/${tableId}/rows/`, undefined, @@ -38,7 +38,7 @@ export default class RowAPI extends BaseAPI { async searchNoPagination( tableId: string, - body: any + body: string ): Promise<[Response, Row[]]> { const [response, json] = await this.post(`/${tableId}/search`, body) expect(json.hasNextPage).toEqual(false) @@ -47,7 +47,7 @@ export default class RowAPI extends BaseAPI { async searchWithPagination( tableId: string, - body: any + body: string ): Promise<[Response, Row[]]> { const [response, json] = await this.post(`/${tableId}/search`, body) expect(json.hasNextPage).toEqual(true) diff --git a/qa-core/src/internal-api/api/apis/ScreenAPI.ts b/qa-core/src/internal-api/api/apis/ScreenAPI.ts index a5f5859820..df3d699cbd 100644 --- a/qa-core/src/internal-api/api/apis/ScreenAPI.ts +++ b/qa-core/src/internal-api/api/apis/ScreenAPI.ts @@ -1,5 +1,6 @@ -import { Screen } from "@budibase/types" import { Response } from "node-fetch" +import { Screen } from "@budibase/types" +import { ScreenRequest } from "../../../types/screens" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" import BaseAPI from "./BaseAPI" @@ -8,7 +9,7 @@ export default class ScreenAPI extends BaseAPI { super(client) } - async create(body: any): Promise<[Response, Screen]> { + async create(body: ScreenRequest): Promise<[Response, Screen]> { const [response, json] = await this.post(`/screens`, body) expect(json._id).toBeDefined() expect(json.routing.roleId).toBe(body.routing.roleId) diff --git a/qa-core/src/internal-api/fixtures/datasources.ts b/qa-core/src/internal-api/fixtures/datasources.ts index dcf6af824a..4797f86631 100644 --- a/qa-core/src/internal-api/fixtures/datasources.ts +++ b/qa-core/src/internal-api/fixtures/datasources.ts @@ -1,5 +1,6 @@ +import { DatasourceRequest } from "../../types" // Add information about the data source to the fixtures file from 1password -export const mongoDB = () => { +export const mongoDB = (): DatasourceRequest => { return { datasource: { name: "MongoDB", @@ -15,7 +16,7 @@ export const mongoDB = () => { } } -export const postgresSQL = () => { +export const postgresSQL = (): DatasourceRequest => { return { datasource: { name: "PostgresSQL", @@ -34,7 +35,7 @@ export const postgresSQL = () => { fetchSchema: true, } } -export const mariaDB = () => { +export const mariaDB = (): DatasourceRequest => { return { datasource: { name: "MariaDB", @@ -54,7 +55,7 @@ export const mariaDB = () => { } } -export const restAPI = () => { +export const restAPI = (): DatasourceRequest => { return { datasource: { name: "RestAPI", diff --git a/qa-core/src/internal-api/fixtures/queries.ts b/qa-core/src/internal-api/fixtures/queries.ts index 83839a0b41..0a28c23ab7 100644 --- a/qa-core/src/internal-api/fixtures/queries.ts +++ b/qa-core/src/internal-api/fixtures/queries.ts @@ -57,7 +57,7 @@ export const expectedSchemaFields = { running_time_secs: "number", title: "string", year: "number", - _id: "json", + _id: "string", }, postgres: { address: "string", diff --git a/qa-core/src/internal-api/fixtures/screens.ts b/qa-core/src/internal-api/fixtures/screens.ts index 97010cc8b6..d07b3bd3ba 100644 --- a/qa-core/src/internal-api/fixtures/screens.ts +++ b/qa-core/src/internal-api/fixtures/screens.ts @@ -1,8 +1,8 @@ import { generator } from "../../shared" - +import { ScreenRequest } from "../../types" const randomId = generator.guid() -export const generateScreen = (roleId: string): any => ({ +export const generateScreen = (roleId: string): ScreenRequest => ({ showNavigation: true, width: "Large", name: randomId, diff --git a/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts b/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts index 44c2c03c8b..3f479136f6 100644 --- a/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts @@ -52,7 +52,7 @@ describe("Internal API - Data Sources: MariaDB", () => { datasourcetoSave ) // Get Query - const [getQueryResponse, getQueryJson] = await config.api.queries.get( + const [getQueryResponse, getQueryJson] = await config.api.queries.getQuery( saveQueryJson._id ) diff --git a/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts b/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts index ed5178b57c..27fc143554 100644 --- a/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts @@ -52,7 +52,7 @@ describe("Internal API - Data Sources: MongoDB", () => { datasourcetoSave ) // Get Query - const [getQueryResponse, getQueryJson] = await config.api.queries.get( + const [getQueryResponse, getQueryJson] = await config.api.queries.getQuery( saveQueryJson._id ) diff --git a/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts index bc8d86b862..ccfcce6f55 100644 --- a/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts @@ -52,7 +52,7 @@ describe("Internal API - Data Sources: PostgresSQL", () => { datasourcetoSave ) // Get Query - const [getQueryResponse, getQueryJson] = await config.api.queries.get( + const [getQueryResponse, getQueryJson] = await config.api.queries.getQuery( saveQueryJson._id! ) diff --git a/qa-core/src/internal-api/tests/dataSources/restAPI.spec.ts b/qa-core/src/internal-api/tests/dataSources/restAPI.spec.ts index d7b75db514..649e21db78 100644 --- a/qa-core/src/internal-api/tests/dataSources/restAPI.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/restAPI.spec.ts @@ -52,7 +52,7 @@ describe("Internal API - Data Sources: REST API", () => { datasourcetoSave ) // Get Query - const [getQueryResponse, getQueryJson] = await config.api.queries.get( + const [getQueryResponse, getQueryJson] = await config.api.queries.getQuery( saveQueryJson._id! ) diff --git a/qa-core/src/types/datasources.ts b/qa-core/src/types/datasources.ts new file mode 100644 index 0000000000..f919e4435f --- /dev/null +++ b/qa-core/src/types/datasources.ts @@ -0,0 +1,22 @@ +export interface DatasourceRequest { + datasource: { + name: string + plus?: boolean + source: string + type: string + config: { + connectionString?: string + db?: string + database?: string + host?: string + password?: string + port?: string + schema?: string + user?: string + defaultHeaders?: {} + rejectUnauthorized?: boolean + url?: string + } + } + fetchSchema: boolean +} diff --git a/qa-core/src/types/index.ts b/qa-core/src/types/index.ts index 6c3740200c..9bde46c66e 100644 --- a/qa-core/src/types/index.ts +++ b/qa-core/src/types/index.ts @@ -8,7 +8,7 @@ export * from "./responseMessage" export * from "./routing" export * from "./state" export * from "./unpublishAppResponse" -export * from "./addedDatasource" - +export * from "./screens" +export * from "./datasources" // re-export public api types export * from "@budibase/server/api/controllers/public/mapping/types" diff --git a/qa-core/src/types/screens.ts b/qa-core/src/types/screens.ts new file mode 100644 index 0000000000..fae65e64fa --- /dev/null +++ b/qa-core/src/types/screens.ts @@ -0,0 +1,32 @@ +export interface ScreenRequest { + showNavigation: boolean + width: string + name: string + template: string + props: ScreenProps + routing: ScreenRouting +} + +interface ScreenProps { + _id: string + _component: string + _styles: { + normal: {} + hover: {} + active: {} + selected: {} + } + _children: [] + _instanceName: string + direction: string + hAlign: string + vAlign: string + size: string + gap: string +} + +interface ScreenRouting { + route: string + roleId: string + homeScreen: boolean +} From 55ee94892a0d9cf109115678059eb0890f5fd82b Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 17 May 2023 22:18:50 +0100 Subject: [PATCH 493/521] Support setting object name for logged json objects --- .../backend-core/src/logging/pino/logger.ts | 29 +++++++++++++++++-- packages/backend-core/src/queue/listeners.ts | 15 ++++++++-- packages/server/src/automations/utils.ts | 20 ++++++++----- 3 files changed, 53 insertions(+), 11 deletions(-) diff --git a/packages/backend-core/src/logging/pino/logger.ts b/packages/backend-core/src/logging/pino/logger.ts index 14c8e7e5a9..cebc78ffc7 100644 --- a/packages/backend-core/src/logging/pino/logger.ts +++ b/packages/backend-core/src/logging/pino/logger.ts @@ -94,12 +94,37 @@ if (!env.DISABLE_PINO_LOGGER) { } } - const mergingObject = { - objects: objects.length ? objects : undefined, + const mergingObject: any = { err: error, ...contextObject, } + if (objects.length) { + // init generic data object for params supplied that don't have a + // '_logKey' field. This prints an object using argument index as the key + // e.g. { 0: {}, 1: {} } + const data: any = {} + let dataIndex = 0 + + for (let i = 0; i < objects.length; i++) { + const object = objects[i] + // the object has specified a log key + // use this instead of generic key + const logKey = object._logKey + if (logKey) { + delete object._logKey + mergingObject[logKey] = object + } else { + data[dataIndex] = object + dataIndex++ + } + } + + if (Object.keys(data).length) { + mergingObject.data = data + } + } + return [mergingObject, message] } diff --git a/packages/backend-core/src/queue/listeners.ts b/packages/backend-core/src/queue/listeners.ts index 6732bfaaa9..42e3172364 100644 --- a/packages/backend-core/src/queue/listeners.ts +++ b/packages/backend-core/src/queue/listeners.ts @@ -45,7 +45,8 @@ function getLogParams( const message = `[BULL] ${eventType}=${event}` const err = opts.error - const data = { + const bullLog = { + _logKey: "bull", eventType, event, job: opts.job, @@ -53,7 +54,17 @@ function getLogParams( ...extra, } - return [message, err, data] + let automationLog + if (opts.job?.data?.automation) { + automationLog = { + _logKey: "automation", + trigger: opts.job + ? opts.job.data.automation.definition.trigger.event + : undefined, + } + } + + return [message, err, bullLog, automationLog] } enum BullEvent { diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts index d9f19013ee..dc2f02c821 100644 --- a/packages/server/src/automations/utils.ts +++ b/packages/server/src/automations/utils.ts @@ -17,10 +17,16 @@ const CRON_STEP_ID = definitions.CRON.stepId const Runner = new Thread(ThreadType.AUTOMATION) function loggingArgs(job: AutomationJob) { - return { - jobId: job.id, - trigger: job.data.automation.definition.trigger.event, - } + return [ + { + _logKey: "automation", + trigger: job.data.automation.definition.trigger.event, + }, + { + _logKey: "bull", + jobId: job.id, + }, + ] } export async function processEvent(job: AutomationJob) { @@ -29,16 +35,16 @@ export async function processEvent(job: AutomationJob) { const task = async () => { try { // need to actually await these so that an error can be captured properly - console.log("automation running", loggingArgs(job)) + console.log("automation running", ...loggingArgs(job)) const runFn = () => Runner.run(job) const result = await quotas.addAutomation(runFn, { automationId, }) - console.log("automation completed", loggingArgs(job)) + console.log("automation completed", ...loggingArgs(job)) return result } catch (err) { - console.error(`automation was unable to run`, err, loggingArgs(job)) + console.error(`automation was unable to run`, err, ...loggingArgs(job)) return { err } } } From 61a7e4bbcf9d29b64332d703a886ac34d37eb4c2 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 18 May 2023 09:08:53 +0200 Subject: [PATCH 494/521] Remove build step from test --- .github/workflows/budibase_ci.yml | 2 -- packages/pro | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 1f9e640b51..1f0e575803 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -59,7 +59,6 @@ jobs: node-version: 14.x cache: "yarn" - run: yarn - - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core --scope=@budibase/string-templates - run: yarn test --ignore=@budibase/pro env: JEST_MAX_WORKERS: ${{ steps.cpu-cores.outputs.count }} @@ -83,7 +82,6 @@ jobs: node-version: 14.x cache: "yarn" - run: yarn - - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core - run: yarn test --scope=@budibase/pro integration-test: diff --git a/packages/pro b/packages/pro index 64a2025727..a590dc237a 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 64a2025727c25d5813832c92eb360de3947b7aa6 +Subproject commit a590dc237a16983b8f39dc8e65005b7736d23467 From 6d44fd012dd2365910d95b706046cc70124c0001 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 18 May 2023 10:22:14 +0200 Subject: [PATCH 495/521] Remove unnecessary paths --- packages/builder/tsconfig.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/builder/tsconfig.json b/packages/builder/tsconfig.json index 400f964e30..0913aea33d 100644 --- a/packages/builder/tsconfig.json +++ b/packages/builder/tsconfig.json @@ -4,12 +4,7 @@ "composite": true, "declaration": true, "sourceMap": true, - "baseUrl": ".", - "paths": { - "@budibase/types": ["../types/src"], - "@budibase/backend-core": ["../backend-core/src"], - "@budibase/backend-core/*": ["../backend-core/*.js"] - } + "baseUrl": "." }, "ts-node": { "require": ["tsconfig-paths/register"] From ba00b8b47d8f63b8c1932ab3bacab2e7e968e679 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 18 May 2023 10:29:08 +0200 Subject: [PATCH 496/521] Add build share-core before test --- .github/workflows/budibase_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 1f0e575803..b8b3d54635 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -59,6 +59,7 @@ jobs: node-version: 14.x cache: "yarn" - run: yarn + - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core --scope=@budibase/string-templates - run: yarn test --ignore=@budibase/pro env: JEST_MAX_WORKERS: ${{ steps.cpu-cores.outputs.count }} From 441a9f65bb28fb404837c13db8a9356378269f8b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 18 May 2023 09:16:16 +0000 Subject: [PATCH 497/521] Bump version to 2.6.19-alpha.0 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 78ab806ba5..c6f78ea0a5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.18", + "version": "2.6.19-alpha.0", "npmClient": "yarn", "packages": [ "packages/backend-core", From de28670be12b286e3831b6d571a28ba2f383469f Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 18 May 2023 12:27:52 +0200 Subject: [PATCH 498/521] Clean pipeline --- .github/workflows/budibase_ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index b8b3d54635..757a9a4983 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -61,9 +61,6 @@ jobs: - run: yarn - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core --scope=@budibase/string-templates - run: yarn test --ignore=@budibase/pro - env: - JEST_MAX_WORKERS: ${{ steps.cpu-cores.outputs.count }} - - uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos From 0850ee7b8c32a4a92c63bd07b805ff93a72849cd Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 18 May 2023 17:37:33 +0200 Subject: [PATCH 499/521] Fix flakiness --- packages/worker/src/tests/structures/groups.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/worker/src/tests/structures/groups.ts b/packages/worker/src/tests/structures/groups.ts index 33af533bd4..b0d6bb8fc0 100644 --- a/packages/worker/src/tests/structures/groups.ts +++ b/packages/worker/src/tests/structures/groups.ts @@ -18,7 +18,7 @@ export const UserGroup = () => { apps: [], color: generator.color(), icon: generator.word(), - name: generator.word({ length: 2 }), + name: generator.word(), roles: roles, users: [], } From d9b105a001d9db048a0009f69c3843a60b073cf5 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 18 May 2023 17:46:24 +0200 Subject: [PATCH 500/521] Don't run tests in parallel --- .github/workflows/budibase_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 757a9a4983..73e000fcda 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -60,7 +60,7 @@ jobs: cache: "yarn" - run: yarn - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core --scope=@budibase/string-templates - - run: yarn test --ignore=@budibase/pro + - run: yarn test --ignore=@budibase/pro --concurrency=1 - uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos From 732ebb4f87e6bffa88eba775e43186d8e6659172 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Thu, 18 May 2023 22:09:44 +0100 Subject: [PATCH 501/521] Adding function to fetch table names. --- .../src/integrations/microsoftSqlServer.ts | 15 ++++++++- packages/server/src/integrations/mysql.ts | 33 +++++++++++++------ packages/server/src/integrations/oracle.ts | 11 +++++++ packages/server/src/integrations/postgres.ts | 11 +++++++ packages/types/src/sdk/datasources.ts | 1 + 5 files changed, 60 insertions(+), 11 deletions(-) diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts index 47f36f60e9..ab0a3e14e8 100644 --- a/packages/server/src/integrations/microsoftSqlServer.ts +++ b/packages/server/src/integrations/microsoftSqlServer.ts @@ -20,7 +20,6 @@ import { } from "./utils" import Sql from "./base/sql" import { MSSQLTablesResponse, MSSQLColumn } from "./base/types" - const sqlServer = require("mssql") const DEFAULT_SCHEMA = "dbo" @@ -284,6 +283,20 @@ class SqlServerIntegration extends Sql implements DatasourcePlus { this.schemaErrors = final.errors } + async queryTableNames() { + let tableInfo: MSSQLTablesResponse[] = await this.runSQL(this.TABLES_SQL) + const schema = this.config.schema || DEFAULT_SCHEMA + return tableInfo + .filter((record: any) => record.TABLE_SCHEMA === schema) + .map((record: any) => record.TABLE_NAME) + .filter((name: string) => this.MASTER_TABLES.indexOf(name) === -1) + } + + async getTableNames() { + await this.connect() + return this.queryTableNames() + } + async read(query: SqlQuery | string) { await this.connect() const response = await this.internalQuery(getSqlQuery(query)) diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts index eb721a6e0f..ca0c962d25 100644 --- a/packages/server/src/integrations/mysql.ts +++ b/packages/server/src/integrations/mysql.ts @@ -214,20 +214,11 @@ class MySQLIntegration extends Sql implements DatasourcePlus { async buildSchema(datasourceId: string, entities: Record) { const tables: { [key: string]: Table } = {} - const database = this.config.database await this.connect() try { // get the tables first - const tablesResp: Record[] = await this.internalQuery( - { sql: "SHOW TABLES;" }, - { connect: false } - ) - const tableNames: string[] = tablesResp.map( - (obj: any) => - obj[`Tables_in_${database}`] || - obj[`Tables_in_${database.toLowerCase()}`] - ) + const tableNames = await this.queryTableNames() for (let tableName of tableNames) { const primaryKeys = [] const schema: TableSchema = {} @@ -274,6 +265,28 @@ class MySQLIntegration extends Sql implements DatasourcePlus { this.schemaErrors = final.errors } + async queryTableNames() { + const database = this.config.database + const tablesResp: Record[] = await this.internalQuery( + { sql: "SHOW TABLES;" }, + { connect: false } + ) + return tablesResp.map( + (obj: any) => + obj[`Tables_in_${database}`] || + obj[`Tables_in_${database.toLowerCase()}`] + ) + } + + async getTableNames() { + await this.connect() + try { + return this.queryTableNames() + } finally { + await this.disconnect() + } + } + async create(query: SqlQuery | string) { const results = await this.internalQuery(getSqlQuery(query)) return results.length ? results : [{ created: true }] diff --git a/packages/server/src/integrations/oracle.ts b/packages/server/src/integrations/oracle.ts index f8ec6e8bae..53e88752cd 100644 --- a/packages/server/src/integrations/oracle.ts +++ b/packages/server/src/integrations/oracle.ts @@ -323,6 +323,17 @@ class OracleIntegration extends Sql implements DatasourcePlus { this.schemaErrors = final.errors } + async getTableNames() { + const columnsResponse = await this.internalQuery({ + sql: this.COLUMNS_SQL, + }) + if (!columnsResponse.rows) { + return [] + } else { + return columnsResponse.rows.map(row => row.TABLE_NAME) + } + } + async testConnection() { const response: ConnectionInfo = { connected: false, diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts index bf77ec08c6..0954f94ecb 100644 --- a/packages/server/src/integrations/postgres.ts +++ b/packages/server/src/integrations/postgres.ts @@ -311,6 +311,17 @@ class PostgresIntegration extends Sql implements DatasourcePlus { } } + async getTableNames() { + try { + await this.openConnection() + const columnsResponse: { rows: PostgresColumn[] } = + await this.client.query(this.COLUMNS_SQL) + return columnsResponse.rows.map(row => row.table_name) + } finally { + await this.closeConnection() + } + } + async create(query: SqlQuery | string) { const response = await this.internalQuery(getSqlQuery(query)) return response.rows.length ? response.rows : [{ created: true }] diff --git a/packages/types/src/sdk/datasources.ts b/packages/types/src/sdk/datasources.ts index 9df9670877..4631a091b4 100644 --- a/packages/types/src/sdk/datasources.ts +++ b/packages/types/src/sdk/datasources.ts @@ -150,4 +150,5 @@ export interface DatasourcePlus extends IntegrationBase { getBindingIdentifier(): string getStringConcat(parts: string[]): string buildSchema(datasourceId: string, entities: Record): any + getTableNames(): Promise } From 2223027d285544f84638d72a48eec42121ad292e Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Thu, 18 May 2023 23:22:52 +0100 Subject: [PATCH 502/521] Adding API for retrieving table names. --- .../server/src/api/controllers/datasource.ts | 16 ++++++++++++++++ packages/server/src/api/routes/datasource.ts | 5 +++++ packages/types/src/api/web/app/datasource.ts | 4 ++++ 3 files changed, 25 insertions(+) diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 8f13e0e618..5c2c4ef684 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -21,6 +21,7 @@ import { CreateDatasourceRequest, VerifyDatasourceRequest, VerifyDatasourceResponse, + FetchTablesDatasourceResponse, IntegrationBase, DatasourcePlus, } from "@budibase/types" @@ -153,6 +154,21 @@ export async function verify( } } +export async function tables( + ctx: UserCtx +) { + const datasourceId = ctx.params.datasourceId + const datasource = await sdk.datasources.get(datasourceId, { enriched: true }) + const connector = (await getConnector(datasource)) as DatasourcePlus + if (!connector.getTableNames) { + ctx.throw(400, "Table name fetching not supported by datasource") + } + const tables = await connector.getTableNames() + ctx.body = { + tables, + } +} + export async function buildSchemaFromDb(ctx: UserCtx) { const db = context.getAppDB() const datasource = await sdk.datasources.get(ctx.params.datasourceId) diff --git a/packages/server/src/api/routes/datasource.ts b/packages/server/src/api/routes/datasource.ts index 654fb794e3..89bc12c543 100644 --- a/packages/server/src/api/routes/datasource.ts +++ b/packages/server/src/api/routes/datasource.ts @@ -20,6 +20,11 @@ router authorized(permissions.BUILDER), datasourceController.verify ) + .get( + "/api/datasources/:datasourceId/tables", + authorized(permissions.BUILDER), + datasourceController.tables + ) .get( "/api/datasources/:datasourceId", authorized( diff --git a/packages/types/src/api/web/app/datasource.ts b/packages/types/src/api/web/app/datasource.ts index 983fd45b92..12c9753aa1 100644 --- a/packages/types/src/api/web/app/datasource.ts +++ b/packages/types/src/api/web/app/datasource.ts @@ -23,6 +23,10 @@ export interface VerifyDatasourceResponse { error?: string } +export interface FetchTablesDatasourceResponse { + tables: string[] +} + export interface UpdateDatasourceRequest extends Datasource { datasource: Datasource } From 5ba9c75e70ee20b9a2bcc3f5d40a66fe937151e4 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 19 May 2023 10:07:46 +0200 Subject: [PATCH 503/521] Remove concurrency=1 --- .github/workflows/budibase_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 73e000fcda..757a9a4983 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -60,7 +60,7 @@ jobs: cache: "yarn" - run: yarn - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core --scope=@budibase/string-templates - - run: yarn test --ignore=@budibase/pro --concurrency=1 + - run: yarn test --ignore=@budibase/pro - uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos From e47aef13d58f4505c385adbfc2f1d338e74f07c9 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 19 May 2023 10:36:23 +0200 Subject: [PATCH 504/521] Fix jest refs --- packages/worker/jest.config.ts | 1 + packages/worker/tsconfig.json | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/worker/jest.config.ts b/packages/worker/jest.config.ts index 2b0d8fe23b..49b6c5d425 100644 --- a/packages/worker/jest.config.ts +++ b/packages/worker/jest.config.ts @@ -16,6 +16,7 @@ const config: Config.InitialOptions = { "@budibase/backend-core/(.*)": "/../backend-core/$1", "@budibase/backend-core": "/../backend-core/src", "@budibase/types": "/../types/src", + "@budibase/shared-core": ["/../shared-core/src"], }, } diff --git a/packages/worker/tsconfig.json b/packages/worker/tsconfig.json index 45c50934b3..0c0d948d27 100644 --- a/packages/worker/tsconfig.json +++ b/packages/worker/tsconfig.json @@ -16,11 +16,7 @@ "require": ["tsconfig-paths/register"], "swc": true }, - "references": [ - { "path": "../types" }, - { "path": "../backend-core" }, - { "path": "../../../budibase-pro/packages/pro" } - ], + "references": [{ "path": "../types" }, { "path": "../backend-core" }], "include": ["src/**/*"], "exclude": ["dist"] } From d85bcbc7e53674c29c4b5c6117c2415b5dbd05e1 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Fri, 19 May 2023 12:19:55 +0100 Subject: [PATCH 505/521] Adding test for postgres verify. --- .../server/src/api/controllers/datasource.ts | 2 +- packages/server/src/api/routes/datasource.ts | 2 +- .../src/integration-test/postgres.spec.ts | 23 ++++++++++++++++--- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 5c2c4ef684..0650305ac1 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -154,7 +154,7 @@ export async function verify( } } -export async function tables( +export async function fetchTables( ctx: UserCtx ) { const datasourceId = ctx.params.datasourceId diff --git a/packages/server/src/api/routes/datasource.ts b/packages/server/src/api/routes/datasource.ts index 89bc12c543..e740510d7f 100644 --- a/packages/server/src/api/routes/datasource.ts +++ b/packages/server/src/api/routes/datasource.ts @@ -23,7 +23,7 @@ router .get( "/api/datasources/:datasourceId/tables", authorized(permissions.BUILDER), - datasourceController.tables + datasourceController.fetchTables ) .get( "/api/datasources/:datasourceId", diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts index 79f6db5cd1..c34f2a9bff 100644 --- a/packages/server/src/integration-test/postgres.spec.ts +++ b/packages/server/src/integration-test/postgres.spec.ts @@ -52,8 +52,8 @@ describe("row api - postgres", () => { makeRequest = generateMakeRequest(apiKey, true) }) - beforeEach(async () => { - postgresDatasource = await config.createDatasource({ + function pgDatasourceConfig() { + return { datasource: { type: "datasource", source: SourceName.POSTGRES, @@ -70,7 +70,11 @@ describe("row api - postgres", () => { ca: false, }, }, - }) + } + } + + beforeEach(async () => { + postgresDatasource = await config.createDatasource(pgDatasourceConfig()) async function createAuxTable(prefix: string) { return await config.createTable({ @@ -439,6 +443,19 @@ describe("row api - postgres", () => { }) }) + describe("POST /api/datasources/verify", () => { + it("should be able to verify the connection", async () => { + const config = pgDatasourceConfig() + const response = await makeRequest( + "post", + "/api/datasources/verify", + config + ) + expect(response.status).toBe(200) + expect(response.body.connected).toBe(true) + }) + }) + describe("DELETE /api/:tableId/rows", () => { const deleteRow = ( tableId: string | undefined, From 701fe442e6f62d25e6d1f07cef5ddf973979cffd Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 19 May 2023 11:20:56 +0000 Subject: [PATCH 506/521] Bump version to 2.6.19-alpha.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index c6f78ea0a5..0b1817c07b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.19-alpha.0", + "version": "2.6.19-alpha.1", "npmClient": "yarn", "packages": [ "packages/backend-core", From 38e39cf2f2b71c49fbe42a0ee272e4cb57ba2a5c Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Fri, 19 May 2023 13:36:05 +0100 Subject: [PATCH 507/521] Adding negative test case for connections and adding test of table name fetching for postgres. --- .../server/src/api/controllers/datasource.ts | 4 +- .../src/integration-test/postgres.spec.ts | 54 ++++++++++++++----- packages/types/src/api/web/app/datasource.ts | 2 +- 3 files changed, 43 insertions(+), 17 deletions(-) diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 0650305ac1..9ae72ddf50 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -163,9 +163,9 @@ export async function fetchTables( if (!connector.getTableNames) { ctx.throw(400, "Table name fetching not supported by datasource") } - const tables = await connector.getTableNames() + const tableNames = await connector.getTableNames() ctx.body = { - tables, + tableNames, } } diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts index c34f2a9bff..b1455f4419 100644 --- a/packages/server/src/integration-test/postgres.spec.ts +++ b/packages/server/src/integration-test/postgres.spec.ts @@ -26,7 +26,7 @@ jest.setTimeout(30000) jest.unmock("pg") -describe("row api - postgres", () => { +describe("postgres integrations", () => { let makeRequest: MakeRequestResponse, postgresDatasource: Datasource, primaryPostgresTable: Table, @@ -443,19 +443,6 @@ describe("row api - postgres", () => { }) }) - describe("POST /api/datasources/verify", () => { - it("should be able to verify the connection", async () => { - const config = pgDatasourceConfig() - const response = await makeRequest( - "post", - "/api/datasources/verify", - config - ) - expect(response.status).toBe(200) - expect(response.body.connected).toBe(true) - }) - }) - describe("DELETE /api/:tableId/rows", () => { const deleteRow = ( tableId: string | undefined, @@ -1041,4 +1028,43 @@ describe("row api - postgres", () => { }) }) }) + + describe("POST /api/datasources/verify", () => { + it("should be able to verify the connection", async () => { + const config = pgDatasourceConfig() + const response = await makeRequest( + "post", + "/api/datasources/verify", + config + ) + expect(response.status).toBe(200) + expect(response.body.connected).toBe(true) + }) + + it("should state an invalid datasource cannot connect", async () => { + const config = pgDatasourceConfig() + config.datasource.config.password = "wrongpassword" + const response = await makeRequest( + "post", + "/api/datasources/verify", + config + ) + expect(response.status).toBe(200) + expect(response.body.connected).toBe(false) + expect(response.body.error).toBeDefined() + }) + }) + + describe("GET /api/datasources/:datasourceId/tables", () => { + it("should fetch tables within postgres datasource", async () => { + const primaryName = primaryPostgresTable.name + const response = await makeRequest( + "get", + `/api/datasources/${postgresDatasource._id}/tables` + ) + expect(response.status).toBe(200) + expect(response.body.tableNames).toBeDefined() + expect(response.body.tableNames.indexOf(primaryName)).not.toBe(-10) + }) + }) }) diff --git a/packages/types/src/api/web/app/datasource.ts b/packages/types/src/api/web/app/datasource.ts index 12c9753aa1..0d0406fe55 100644 --- a/packages/types/src/api/web/app/datasource.ts +++ b/packages/types/src/api/web/app/datasource.ts @@ -24,7 +24,7 @@ export interface VerifyDatasourceResponse { } export interface FetchTablesDatasourceResponse { - tables: string[] + tableNames: string[] } export interface UpdateDatasourceRequest extends Datasource { From 6e23d78677696e0229fc2a89bcded14ee86cad93 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 22 May 2023 11:50:33 +0000 Subject: [PATCH 508/521] Bump version to 2.6.19-alpha.2 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 0b1817c07b..79f2b50497 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.19-alpha.1", + "version": "2.6.19-alpha.2", "npmClient": "yarn", "packages": [ "packages/backend-core", From d6c07f47b649c7f14ae93a697fc7eccc98a63372 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 22 May 2023 13:57:56 +0100 Subject: [PATCH 509/521] Adding base implementation for googlesheets integration. --- packages/server/src/integrations/googlesheets.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index eea9cc4176..0a5d2acefc 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -240,6 +240,11 @@ class GoogleSheetsIntegration implements DatasourcePlus { } } + getTableNames(): Promise { + // TODO: implement + return Promise.resolve([]) + } + getTableSchema(title: string, headerValues: string[], id?: string) { // base table const table: Table = { From 83ddb9c8dde1f8b5f4ea13e3bde1dc637ddb6002 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 22 May 2023 14:28:18 +0100 Subject: [PATCH 510/521] Adding feature to denote fetch table names function. --- packages/server/src/integrations/googlesheets.ts | 7 +++++-- packages/server/src/integrations/microsoftSqlServer.ts | 5 ++++- packages/server/src/integrations/mysql.ts | 5 ++++- packages/server/src/integrations/oracle.ts | 5 ++++- packages/server/src/integrations/postgres.ts | 5 ++++- packages/types/src/sdk/datasources.ts | 1 + 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index 0a5d2acefc..e965ebc86c 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -63,10 +63,13 @@ const SCHEMA: Integration = { relationships: false, docs: "https://developers.google.com/sheets/api/quickstart/nodejs", description: - "Create and collaborate on online spreadsheets in real-time and from any device. ", + "Create and collaborate on online spreadsheets in real-time and from any device.", friendlyName: "Google Sheets", type: "Spreadsheet", - features: [DatasourceFeature.CONNECTION_CHECKING], + features: [ + DatasourceFeature.CONNECTION_CHECKING, + DatasourceFeature.FETCH_TABLE_NAMES, + ], datasource: { spreadsheetId: { display: "Google Sheet URL", diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts index ab0a3e14e8..a83630afbb 100644 --- a/packages/server/src/integrations/microsoftSqlServer.ts +++ b/packages/server/src/integrations/microsoftSqlServer.ts @@ -40,7 +40,10 @@ const SCHEMA: Integration = { "Microsoft SQL Server is a relational database management system developed by Microsoft. ", friendlyName: "MS SQL Server", type: "Relational", - features: [DatasourceFeature.CONNECTION_CHECKING], + features: [ + DatasourceFeature.CONNECTION_CHECKING, + DatasourceFeature.FETCH_TABLE_NAMES, + ], datasource: { user: { type: DatasourceFieldType.STRING, diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts index ca0c962d25..d83ce300d3 100644 --- a/packages/server/src/integrations/mysql.ts +++ b/packages/server/src/integrations/mysql.ts @@ -36,7 +36,10 @@ const SCHEMA: Integration = { type: "Relational", description: "MySQL Database Service is a fully managed database service to deploy cloud-native applications. ", - features: [DatasourceFeature.CONNECTION_CHECKING], + features: [ + DatasourceFeature.CONNECTION_CHECKING, + DatasourceFeature.FETCH_TABLE_NAMES, + ], datasource: { host: { type: DatasourceFieldType.STRING, diff --git a/packages/server/src/integrations/oracle.ts b/packages/server/src/integrations/oracle.ts index 53e88752cd..55b425f480 100644 --- a/packages/server/src/integrations/oracle.ts +++ b/packages/server/src/integrations/oracle.ts @@ -50,7 +50,10 @@ const SCHEMA: Integration = { type: "Relational", description: "Oracle Database is an object-relational database management system developed by Oracle Corporation", - features: [DatasourceFeature.CONNECTION_CHECKING], + features: [ + DatasourceFeature.CONNECTION_CHECKING, + DatasourceFeature.FETCH_TABLE_NAMES, + ], datasource: { host: { type: DatasourceFieldType.STRING, diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts index 0954f94ecb..d8385705f1 100644 --- a/packages/server/src/integrations/postgres.ts +++ b/packages/server/src/integrations/postgres.ts @@ -52,7 +52,10 @@ const SCHEMA: Integration = { type: "Relational", description: "PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance.", - features: [DatasourceFeature.CONNECTION_CHECKING], + features: [ + DatasourceFeature.CONNECTION_CHECKING, + DatasourceFeature.FETCH_TABLE_NAMES, + ], datasource: { host: { type: DatasourceFieldType.STRING, diff --git a/packages/types/src/sdk/datasources.ts b/packages/types/src/sdk/datasources.ts index 4631a091b4..24ccea7e83 100644 --- a/packages/types/src/sdk/datasources.ts +++ b/packages/types/src/sdk/datasources.ts @@ -75,6 +75,7 @@ export enum FilterType { export enum DatasourceFeature { CONNECTION_CHECKING = "connection", + FETCH_TABLE_NAMES = "fetch_table_names", } export interface StepDefinition { From 76eef8d3d4a54ff999c0e35f022612e0d8dcc70e Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 22 May 2023 16:25:50 +0100 Subject: [PATCH 511/521] Fixing some test issues. --- packages/server/src/api/routes/tests/datasource.spec.ts | 2 +- packages/server/src/integration-test/postgres.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/routes/tests/datasource.spec.ts b/packages/server/src/api/routes/tests/datasource.spec.ts index 53d04bdbff..5019073db4 100644 --- a/packages/server/src/api/routes/tests/datasource.spec.ts +++ b/packages/server/src/api/routes/tests/datasource.spec.ts @@ -87,7 +87,7 @@ describe("/datasources", () => { expect(contents.rows.length).toEqual(1) // update the datasource to remove the variables - datasource.config.dynamicVariables = [] + datasource.config!.dynamicVariables = [] const res = await request .put(`/api/datasources/${datasource._id}`) .send(datasource) diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts index b1455f4419..0fd9b7c143 100644 --- a/packages/server/src/integration-test/postgres.spec.ts +++ b/packages/server/src/integration-test/postgres.spec.ts @@ -1064,7 +1064,7 @@ describe("postgres integrations", () => { ) expect(response.status).toBe(200) expect(response.body.tableNames).toBeDefined() - expect(response.body.tableNames.indexOf(primaryName)).not.toBe(-10) + expect(response.body.tableNames.indexOf(primaryName)).not.toBe(-1) }) }) }) From 74ea851fa32998ac755c628c11117da1e40b07aa Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 23 May 2023 09:55:46 +0200 Subject: [PATCH 512/521] Fetch google sheets --- packages/server/src/integrations/googlesheets.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index e965ebc86c..5cef17dde8 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -243,9 +243,10 @@ class GoogleSheetsIntegration implements DatasourcePlus { } } - getTableNames(): Promise { - // TODO: implement - return Promise.resolve([]) + async getTableNames(): Promise { + await this.connect() + const sheets = this.client.sheetsByIndex + return sheets.map(s => s.title) } getTableSchema(title: string, headerValues: string[], id?: string) { From 5ea19986b13c21db69457d714c1194fe8050a667 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 23 May 2023 10:14:06 +0200 Subject: [PATCH 513/521] Add basic test --- .../integrations/tests/googlesheets.spec.ts | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/packages/server/src/integrations/tests/googlesheets.spec.ts b/packages/server/src/integrations/tests/googlesheets.spec.ts index 0e7669a957..7f6c641aa9 100644 --- a/packages/server/src/integrations/tests/googlesheets.spec.ts +++ b/packages/server/src/integrations/tests/googlesheets.spec.ts @@ -17,12 +17,14 @@ jest.mock("google-spreadsheet") const { GoogleSpreadsheet } = require("google-spreadsheet") const sheetsByTitle: { [title: string]: GoogleSpreadsheetWorksheet } = {} +const sheetsByIndex: GoogleSpreadsheetWorksheet[] = [] GoogleSpreadsheet.mockImplementation(() => { return { useOAuth2Client: jest.fn(), loadInfo: jest.fn(), sheetsByTitle, + sheetsByIndex, } }) @@ -88,7 +90,7 @@ describe("Google Sheets Integration", () => { } describe("update table", () => { - test("adding a new field will be adding a new header row", async () => { + it("adding a new field will be adding a new header row", async () => { await config.doInContext(structures.uuid(), async () => { const tableColumns = ["name", "description", "new field"] const table = createBasicTable(structures.uuid(), tableColumns) @@ -103,7 +105,7 @@ describe("Google Sheets Integration", () => { }) }) - test("removing an existing field will remove the header from the google sheet", async () => { + it("removing an existing field will remove the header from the google sheet", async () => { const sheet = await config.doInContext(structures.uuid(), async () => { const tableColumns = ["name"] const table = createBasicTable(structures.uuid(), tableColumns) @@ -123,4 +125,20 @@ describe("Google Sheets Integration", () => { expect((sheet.setHeaderRow as any).mock.calls[0][0]).toHaveLength(1) }) }) + + describe("getTableNames", () => { + it("can fetch table names", async () => { + await config.doInContext(structures.uuid(), async () => { + const sheetNames: string[] = [] + for (let i = 0; i < 5; i++) { + const sheet = createSheet({ headerValues: [] }) + sheetsByIndex.push(sheet) + sheetNames.push(sheet.title) + } + + const res = await integration.getTableNames() + expect(res).toEqual(sheetNames) + }) + }) + }) }) From b7b604ca0005c8467aaa5f1e4713e6eb85ab536f Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 23 May 2023 10:17:42 +0200 Subject: [PATCH 514/521] Improve test --- .../integrations/tests/googlesheets.spec.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/server/src/integrations/tests/googlesheets.spec.ts b/packages/server/src/integrations/tests/googlesheets.spec.ts index 7f6c641aa9..5aabb13afc 100644 --- a/packages/server/src/integrations/tests/googlesheets.spec.ts +++ b/packages/server/src/integrations/tests/googlesheets.spec.ts @@ -18,15 +18,14 @@ const { GoogleSpreadsheet } = require("google-spreadsheet") const sheetsByTitle: { [title: string]: GoogleSpreadsheetWorksheet } = {} const sheetsByIndex: GoogleSpreadsheetWorksheet[] = [] +const mockGoogleIntegration = { + useOAuth2Client: jest.fn(), + loadInfo: jest.fn(), + sheetsByTitle, + sheetsByIndex, +} -GoogleSpreadsheet.mockImplementation(() => { - return { - useOAuth2Client: jest.fn(), - loadInfo: jest.fn(), - sheetsByTitle, - sheetsByIndex, - } -}) +GoogleSpreadsheet.mockImplementation(() => mockGoogleIntegration) import { structures } from "@budibase/backend-core/tests" import TestConfiguration from "../../tests/utilities/TestConfiguration" @@ -55,6 +54,8 @@ describe("Google Sheets Integration", () => { }, }) await config.init() + + jest.clearAllMocks() }) function createBasicTable(name: string, columns: string[]): Table { @@ -137,6 +138,8 @@ describe("Google Sheets Integration", () => { } const res = await integration.getTableNames() + + expect(mockGoogleIntegration.loadInfo).toBeCalledTimes(1) expect(res).toEqual(sheetNames) }) }) From 023373bb254326ef96e30c25a8c8d597baeab871 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 23 May 2023 10:18:37 +0200 Subject: [PATCH 515/521] Remove unnecessary load info --- packages/server/src/integrations/googlesheets.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index 5cef17dde8..d1f3f9e950 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -148,7 +148,6 @@ class GoogleSheetsIntegration implements DatasourcePlus { async testConnection(): Promise { try { await this.connect() - await this.client.loadInfo() return { connected: true } } catch (e: any) { return { From e838a90d3e22914be68be43ace9e28a75fe56905 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 23 May 2023 10:22:26 +0200 Subject: [PATCH 516/521] Add small unit test --- .../src/integrations/tests/googlesheets.spec.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/server/src/integrations/tests/googlesheets.spec.ts b/packages/server/src/integrations/tests/googlesheets.spec.ts index 5aabb13afc..fcb24c152a 100644 --- a/packages/server/src/integrations/tests/googlesheets.spec.ts +++ b/packages/server/src/integrations/tests/googlesheets.spec.ts @@ -144,4 +144,15 @@ describe("Google Sheets Integration", () => { }) }) }) + + describe("testConnection", () => { + it("can test successful connections", async () => { + await config.doInContext(structures.uuid(), async () => { + const res = await integration.testConnection() + + expect(mockGoogleIntegration.loadInfo).toBeCalledTimes(1) + expect(res).toEqual({ connected: true }) + }) + }) + }) }) From 5681f47a3839c56016b49f995d020e816dc535ef Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 23 May 2023 11:00:55 +0200 Subject: [PATCH 517/521] Clean schema error messages while changing datasources --- packages/builder/src/stores/backend/datasources.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/backend/datasources.js index ed84bb8ee9..576b4d8b76 100644 --- a/packages/builder/src/stores/backend/datasources.js +++ b/packages/builder/src/stores/backend/datasources.js @@ -25,6 +25,8 @@ export function createDatasourcesStore() { store.update(state => ({ ...state, selectedDatasourceId: id, + // Remove any possible schema error + schemaError: null, })) } From aa58a24a6dc863d90d9748c803f143401fae7aca Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 23 May 2023 11:20:18 +0200 Subject: [PATCH 518/521] Change query for retrieving postgres primary keys --- packages/server/src/integrations/postgres.ts | 21 +++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts index bf77ec08c6..9d6ec5969d 100644 --- a/packages/server/src/integrations/postgres.ts +++ b/packages/server/src/integrations/postgres.ts @@ -126,14 +126,15 @@ class PostgresIntegration extends Sql implements DatasourcePlus { COLUMNS_SQL!: string - PRIMARY_KEYS_SQL = ` - select tc.table_schema, tc.table_name, kc.column_name as primary_key - from information_schema.table_constraints tc - join - information_schema.key_column_usage kc on kc.table_name = tc.table_name - and kc.table_schema = tc.table_schema - and kc.constraint_name = tc.constraint_name - where tc.constraint_type = 'PRIMARY KEY'; + PRIMARY_KEYS_SQL = () => ` + SELECT pg_namespace.nspname table_schema + , pg_class.relname table_name + , pg_attribute.attname primary_key + FROM pg_class + JOIN pg_index ON pg_class.oid = pg_index.indrelid AND pg_index.indisprimary + JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid AND pg_attribute.attnum = ANY(pg_index.indkey) + JOIN pg_namespace ON pg_namespace.oid = pg_class.relnamespace + WHERE pg_namespace.nspname = '${this.config.schema}'; ` constructor(config: PostgresConfig) { @@ -239,7 +240,9 @@ class PostgresIntegration extends Sql implements DatasourcePlus { let tableKeys: { [key: string]: string[] } = {} await this.openConnection() try { - const primaryKeysResponse = await this.client.query(this.PRIMARY_KEYS_SQL) + const primaryKeysResponse = await this.client.query( + this.PRIMARY_KEYS_SQL() + ) for (let table of primaryKeysResponse.rows) { const tableName = table.table_name if (!tableKeys[tableName]) { From 590844c8a96f0bd3d68a88e432f87589213dadfc Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 23 May 2023 12:22:22 +0100 Subject: [PATCH 519/521] PR comments. --- packages/server/src/api/controllers/datasource.ts | 6 +++--- packages/server/src/api/routes/datasource.ts | 4 ++-- packages/server/src/integration-test/postgres.spec.ts | 6 +++--- packages/server/src/integrations/oracle.ts | 6 +----- packages/types/src/api/web/app/datasource.ts | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 9ae72ddf50..2d7ba8224f 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -21,7 +21,7 @@ import { CreateDatasourceRequest, VerifyDatasourceRequest, VerifyDatasourceResponse, - FetchTablesDatasourceResponse, + FetchDatasourceInfoResponse, IntegrationBase, DatasourcePlus, } from "@budibase/types" @@ -154,8 +154,8 @@ export async function verify( } } -export async function fetchTables( - ctx: UserCtx +export async function information( + ctx: UserCtx ) { const datasourceId = ctx.params.datasourceId const datasource = await sdk.datasources.get(datasourceId, { enriched: true }) diff --git a/packages/server/src/api/routes/datasource.ts b/packages/server/src/api/routes/datasource.ts index e740510d7f..ac8256539c 100644 --- a/packages/server/src/api/routes/datasource.ts +++ b/packages/server/src/api/routes/datasource.ts @@ -21,9 +21,9 @@ router datasourceController.verify ) .get( - "/api/datasources/:datasourceId/tables", + "/api/datasources/:datasourceId/info", authorized(permissions.BUILDER), - datasourceController.fetchTables + datasourceController.information ) .get( "/api/datasources/:datasourceId", diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts index 0fd9b7c143..ce16ca4aba 100644 --- a/packages/server/src/integration-test/postgres.spec.ts +++ b/packages/server/src/integration-test/postgres.spec.ts @@ -1055,12 +1055,12 @@ describe("postgres integrations", () => { }) }) - describe("GET /api/datasources/:datasourceId/tables", () => { - it("should fetch tables within postgres datasource", async () => { + describe("GET /api/datasources/:datasourceId/info", () => { + it("should fetch information about postgres datasource", async () => { const primaryName = primaryPostgresTable.name const response = await makeRequest( "get", - `/api/datasources/${postgresDatasource._id}/tables` + `/api/datasources/${postgresDatasource._id}/info` ) expect(response.status).toBe(200) expect(response.body.tableNames).toBeDefined() diff --git a/packages/server/src/integrations/oracle.ts b/packages/server/src/integrations/oracle.ts index 55b425f480..afb7021a74 100644 --- a/packages/server/src/integrations/oracle.ts +++ b/packages/server/src/integrations/oracle.ts @@ -330,11 +330,7 @@ class OracleIntegration extends Sql implements DatasourcePlus { const columnsResponse = await this.internalQuery({ sql: this.COLUMNS_SQL, }) - if (!columnsResponse.rows) { - return [] - } else { - return columnsResponse.rows.map(row => row.TABLE_NAME) - } + return (columnsResponse.rows || []).map(row => row.TABLE_NAME) } async testConnection() { diff --git a/packages/types/src/api/web/app/datasource.ts b/packages/types/src/api/web/app/datasource.ts index 0d0406fe55..d15f65eb35 100644 --- a/packages/types/src/api/web/app/datasource.ts +++ b/packages/types/src/api/web/app/datasource.ts @@ -23,7 +23,7 @@ export interface VerifyDatasourceResponse { error?: string } -export interface FetchTablesDatasourceResponse { +export interface FetchDatasourceInfoResponse { tableNames: string[] } From e09b1d05eb4952220594c68173d11d01d86a62d2 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 23 May 2023 11:44:38 +0000 Subject: [PATCH 520/521] Bump version to 2.6.19-alpha.3 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 79f2b50497..e0895d00f2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.19-alpha.2", + "version": "2.6.19-alpha.3", "npmClient": "yarn", "packages": [ "packages/backend-core", From 22dde1fb79980794ac10f79e11aad4ec79f2756b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 23 May 2023 13:42:37 +0000 Subject: [PATCH 521/521] Bump version to 2.6.19-alpha.4 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index e0895d00f2..173e3b7a15 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.19-alpha.3", + "version": "2.6.19-alpha.4", "npmClient": "yarn", "packages": [ "packages/backend-core",