From e2033898b0d7e23ce72b6ca5b84aa544a8b3445e Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 30 Aug 2022 11:17:11 +0100 Subject: [PATCH 01/21] Add additional params to listObjects --- packages/server/src/integrations/s3.ts | 34 ++++++++++++++++--- .../server/src/integrations/tests/s3.spec.js | 12 +++++-- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index e8da696424..fabb6daa3d 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -1,4 +1,4 @@ -import { Integration, QueryType, IntegrationBase } from "@budibase/types" +import { Integration, QueryType, IntegrationBase, DatasourceFieldType } from "@budibase/types" module S3Module { const AWS = require("aws-sdk") @@ -46,12 +46,25 @@ module S3Module { type: QueryType.FIELDS, fields: { bucket: { - type: "string", + type: DatasourceFieldType.STRING, required: true, }, + delimiter: { + type: DatasourceFieldType.STRING, + }, + marker: { + type: DatasourceFieldType.STRING, + }, + maxKeys: { + type: DatasourceFieldType.NUMBER, + display: "Max Keys", + }, + prefix: { + type: DatasourceFieldType.STRING, + }, }, - }, - }, + } + } } class S3Integration implements IntegrationBase { @@ -69,10 +82,21 @@ module S3Module { this.client = new AWS.S3(this.config) } - async read(query: { bucket: string }) { + async read(query: { + bucket: string, + delimiter: string, + expectedBucketOwner: string, + marker: string, + maxKeys: number, + prefix: string, + }) { const response = await this.client .listObjects({ Bucket: query.bucket, + Delimiter: query.delimiter, + Marker: query.marker, + MaxKeys: query.maxKeys, + Prefix: query.prefix, }) .promise() return response.Contents diff --git a/packages/server/src/integrations/tests/s3.spec.js b/packages/server/src/integrations/tests/s3.spec.js index 7ac403dbd4..a655112973 100644 --- a/packages/server/src/integrations/tests/s3.spec.js +++ b/packages/server/src/integrations/tests/s3.spec.js @@ -17,10 +17,18 @@ describe("S3 Integration", () => { it("calls the read method with the correct params", async () => { const response = await config.integration.read({ - bucket: "test" + bucket: "test", + delimiter: "/", + marker: "file.txt", + maxKeys: 999, + prefix: "directory/", }) expect(config.integration.client.listObjects).toHaveBeenCalledWith({ - Bucket: "test" + Bucket: "test", + Delimiter: "/", + Marker: "file.txt", + MaxKeys: 999, + Prefix: "directory/" }) }) }) \ No newline at end of file From 9e864e07a9ea8cf270611df8e75de88a7dc0dcbf Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 30 Aug 2022 13:42:49 +0100 Subject: [PATCH 02/21] WIP --- packages/server/package.json | 2 +- packages/server/src/integrations/s3.ts | 66 ++++++++++++++++++++++---- packages/server/yarn.lock | 2 +- 3 files changed, 58 insertions(+), 12 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 4ef6a5bd18..4d4c580709 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -95,7 +95,7 @@ "bcryptjs": "2.4.3", "bull": "4.8.5", "chmodr": "1.2.0", - "csvtojson": "2.0.10", + "csvtojson": "^2.0.10", "curlconverter": "3.21.0", "dotenv": "8.2.0", "download": "8.0.0", diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index fabb6daa3d..ddae25eee8 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -1,7 +1,13 @@ -import { Integration, QueryType, IntegrationBase, DatasourceFieldType } from "@budibase/types" +import { + Integration, + QueryType, + IntegrationBase, + DatasourceFieldType, +} from "@budibase/types" module S3Module { const AWS = require("aws-sdk") + const csv = require("csvtojson") interface S3Config { region: string @@ -63,8 +69,22 @@ module S3Module { type: DatasourceFieldType.STRING, }, }, - } - } + }, + readCsv: { + displayName: "Read CSV", + type: QueryType.FIELDS, + fields: { + bucket: { + type: DatasourceFieldType.STRING, + required: true, + }, + key: { + type: DatasourceFieldType.STRING, + required: true, + }, + }, + }, + }, } class S3Integration implements IntegrationBase { @@ -82,13 +102,13 @@ module S3Module { this.client = new AWS.S3(this.config) } - async read(query: { - bucket: string, - delimiter: string, - expectedBucketOwner: string, - marker: string, - maxKeys: number, - prefix: string, + async read(query: { + bucket: string + delimiter: string + expectedBucketOwner: string + marker: string + maxKeys: number + prefix: string }) { const response = await this.client .listObjects({ @@ -101,6 +121,32 @@ module S3Module { .promise() return response.Contents } + + async readCsv(query: { bucket: string; key: string }) { + let streamErr: string | undefined = undefined + const stream = this.client + .getObject({ + Bucket: query.bucket, + Key: query.key, + }) + .createReadStream() + .on("error", (err: string) => { + //stream.destroy() + // + console.log("err ", err) + streamErr = "ERROR" + }) + + if (streamErr) { + throw new Error("ERROR") + } + + try { + return await csv().fromStream(stream) + } catch (err) { + throw new Error("Failed to read CSV") + } + } } module.exports = { diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 0e6b40cc30..64239ce820 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -4924,7 +4924,7 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csvtojson@2.0.10: +csvtojson@^2.0.10: version "2.0.10" resolved "https://registry.yarnpkg.com/csvtojson/-/csvtojson-2.0.10.tgz#11e7242cc630da54efce7958a45f443210357574" integrity sha512-lUWFxGKyhraKCW8Qghz6Z0f2l/PqB1W3AO0HKJzGIQ5JRSlR651ekJDiGJbBT4sRNNv5ddnSGVEnsxP9XRCVpQ== From 1e70f6afb4122e74566652a755b658f887f892f6 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 30 Aug 2022 13:55:55 +0100 Subject: [PATCH 03/21] Promisify stream --- packages/server/src/integrations/s3.ts | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index ddae25eee8..43aa04de6a 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -123,29 +123,22 @@ module S3Module { } async readCsv(query: { bucket: string; key: string }) { - let streamErr: string | undefined = undefined const stream = this.client .getObject({ Bucket: query.bucket, Key: query.key, }) .createReadStream() - .on("error", (err: string) => { - //stream.destroy() - // - console.log("err ", err) - streamErr = "ERROR" - }) - if (streamErr) { - throw new Error("ERROR") - } - - try { - return await csv().fromStream(stream) - } catch (err) { - throw new Error("Failed to read CSV") - } + return new Promise((resolve, reject) => { + stream + .on("error", (err: Error) => { + reject(err) + }) + .on("finish", async () => { + resolve(csv().fromStream(stream)) + }) + }) } } From 8c40394d3561c18bbaf4ac655fb33149c70f3e1e Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 30 Aug 2022 15:18:44 +0100 Subject: [PATCH 04/21] Handle non-csv file error --- packages/server/src/integrations/s3.ts | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index 43aa04de6a..eb3605af8f 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -130,14 +130,25 @@ module S3Module { }) .createReadStream() - return new Promise((resolve, reject) => { - stream - .on("error", (err: Error) => { - reject(err) - }) - .on("finish", async () => { - resolve(csv().fromStream(stream)) + let csvError = false + return new Promise(async (resolve, reject) => { + stream.on("error", (err: Error) => { + reject(err) + }) + const response = csv() + .fromStream(stream) + .on("error", () => { + csvError = true }) + stream.on("finish", () => { + resolve(response) + }) + }).catch(err => { + if (csvError) { + throw new Error("Could not read CSV") + } else { + throw err + } }) } } From 0e219e15455e9fd8844d598f3fa9cab396ead80c Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 30 Aug 2022 15:19:18 +0100 Subject: [PATCH 05/21] remove async --- packages/server/src/integrations/s3.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index eb3605af8f..f24fe92f6b 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -131,7 +131,7 @@ module S3Module { .createReadStream() let csvError = false - return new Promise(async (resolve, reject) => { + return new Promise((resolve, reject) => { stream.on("error", (err: Error) => { reject(err) }) From 3443e2cd48774e8e739d68f98d7de4397f43af69 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 30 Aug 2022 16:56:56 +0100 Subject: [PATCH 06/21] Create WIP --- packages/server/src/integrations/s3.ts | 92 +++++++++++++++++++ .../server/src/integrations/tests/s3.spec.js | 32 ++++++- 2 files changed, 123 insertions(+), 1 deletion(-) diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index f24fe92f6b..67568436c3 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -48,6 +48,41 @@ module S3Module { }, }, query: { + create: { + type: QueryType.FIELDS, + fields: { + bucket: { + display: "New Bucket", + type: DatasourceFieldType.STRING, + required: true, + }, + location: { + required: true, + default: "us-east-1", + type: DatasourceFieldType.STRING, + }, + grantFullControl: { + display: "Grant full control", + type: DatasourceFieldType.STRING, + }, + grantRead: { + display: "Grant read", + type: DatasourceFieldType.STRING, + }, + grantReadAcp: { + display: "Grant read ACP", + type: DatasourceFieldType.STRING, + }, + grantWrite: { + display: "Grant write", + type: DatasourceFieldType.STRING, + }, + grantWriteAcp: { + display: "Grant write ACP", + type: DatasourceFieldType.STRING, + }, + }, + }, read: { type: QueryType.FIELDS, fields: { @@ -85,6 +120,33 @@ module S3Module { }, }, }, + extra: { + acl: { + required: false, + displayName: "ACL", + type: DatasourceFieldType.LIST, + data: { + create: [ + "private", + "public-read", + "public-read-write", + "authenticated-read", + ] + } + }, + objectOwnership: { + required: false, + displayName: "Object ownership", + type: DatasourceFieldType.LIST, + data: { + create: [ + "BucketOwnerPreferred", + "ObjectWriter", + "BucketOwnerEnforced", + ], + }, + }, + } } class S3Integration implements IntegrationBase { @@ -102,6 +164,36 @@ module S3Module { this.client = new AWS.S3(this.config) } + async create(query: { + bucket: string, + location: string, + grantFullControl: string, + grantRead: string, + grantReadAcp: string, + grantWrite: string, + grantWriteAcp: string, + extra: { + acl: string, + objectOwnership: string, + }}) { + const response = await this.client.createBucket({ + Bucket: query.bucket, + // ACL: query.extra?.acl, + CreateBucketConfiguration: { + LocationConstraint: query.location + }, + GrantFullControl: query.grantFullControl, + GrantRead: query.grantRead, + GrantReadACP: query.grantReadAcp, + GrantWrite: query.grantWrite, + GrantWriteACP: query.grantWriteAcp, + }, (err: any) => { + console.log("ERR ", err) + }) + .promise() + return response.Contents + } + async read(query: { bucket: string delimiter: string diff --git a/packages/server/src/integrations/tests/s3.spec.js b/packages/server/src/integrations/tests/s3.spec.js index a655112973..48e7221ef8 100644 --- a/packages/server/src/integrations/tests/s3.spec.js +++ b/packages/server/src/integrations/tests/s3.spec.js @@ -16,7 +16,7 @@ describe("S3 Integration", () => { }) it("calls the read method with the correct params", async () => { - const response = await config.integration.read({ + await config.integration.read({ bucket: "test", delimiter: "/", marker: "file.txt", @@ -31,4 +31,34 @@ describe("S3 Integration", () => { Prefix: "directory/" }) }) + + it("calls the create method with the correct params", async () => { + await config.integration.create({ + bucket: "test", + location: "af-south-1", + grantFullControl: "me", + grantRead: "him", + grantReadAcp: "her", + grantWrite: "she", + grantWriteAcp: "he", + objectLockEnabledForBucket: true + }, { + acl: "private", + objectOwnership: "BucketOwnerPreferred" + }) + expect(config.integration.client.createBucket).toHaveBeenCalledWith({ + Bucket: "test", + CreateBucketConfiguration: { + LocationConstraint: "af-south-1" + }, + GrantFullControl: "me", + GrantRead: "him", + GrantReadAcp: "her", + GrantWrite: "she", + GrantWriteAcp: "he", + ObjectLockEnabledForBucket: true, + ACL: "private", + ObjectOwnership: "BucketOwnerPreferred" + }) + }) }) \ No newline at end of file From 088cf26b468f876f6b61a25b2d136ec2d78323c0 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 30 Aug 2022 19:17:10 +0100 Subject: [PATCH 07/21] Create Bucket --- packages/server/__mocks__/aws-sdk.ts | 7 +++ packages/server/src/integrations/s3.ts | 54 ++++++++----------- .../server/src/integrations/tests/s3.spec.js | 29 +++++++--- 3 files changed, 49 insertions(+), 41 deletions(-) diff --git a/packages/server/__mocks__/aws-sdk.ts b/packages/server/__mocks__/aws-sdk.ts index 75353db7e6..24873ac174 100644 --- a/packages/server/__mocks__/aws-sdk.ts +++ b/packages/server/__mocks__/aws-sdk.ts @@ -37,6 +37,13 @@ module AwsMock { Contents: {}, }) ) + + // @ts-ignore + this.createBucket = jest.fn( + response({ + Contents: {}, + }) + ) } aws.DynamoDB = { DocumentClient } diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index 67568436c3..b717ece222 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -131,22 +131,10 @@ module S3Module { "public-read", "public-read-write", "authenticated-read", - ] - } - }, - objectOwnership: { - required: false, - displayName: "Object ownership", - type: DatasourceFieldType.LIST, - data: { - create: [ - "BucketOwnerPreferred", - "ObjectWriter", - "BucketOwnerEnforced", ], }, }, - } + }, } class S3Integration implements IntegrationBase { @@ -165,33 +153,33 @@ module S3Module { } async create(query: { - bucket: string, - location: string, - grantFullControl: string, - grantRead: string, - grantReadAcp: string, - grantWrite: string, - grantWriteAcp: string, + bucket: string + location: string + grantFullControl: string + grantRead: string + grantReadAcp: string + grantWrite: string + grantWriteAcp: string extra: { - acl: string, - objectOwnership: string, - }}) { - const response = await this.client.createBucket({ + acl: string + } + }) { + let params: any = { Bucket: query.bucket, - // ACL: query.extra?.acl, - CreateBucketConfiguration: { - LocationConstraint: query.location - }, + ACL: query.extra?.acl, GrantFullControl: query.grantFullControl, GrantRead: query.grantRead, GrantReadACP: query.grantReadAcp, GrantWrite: query.grantWrite, GrantWriteACP: query.grantWriteAcp, - }, (err: any) => { - console.log("ERR ", err) - }) - .promise() - return response.Contents + } + if (query.location) { + params["CreateBucketConfiguration"] = { + LocationConstraint: query.location, + } + } + const response = await this.client.createBucket(params).promise() + return response } async read(query: { diff --git a/packages/server/src/integrations/tests/s3.spec.js b/packages/server/src/integrations/tests/s3.spec.js index 48e7221ef8..26a87fa99f 100644 --- a/packages/server/src/integrations/tests/s3.spec.js +++ b/packages/server/src/integrations/tests/s3.spec.js @@ -41,10 +41,10 @@ describe("S3 Integration", () => { grantReadAcp: "her", grantWrite: "she", grantWriteAcp: "he", - objectLockEnabledForBucket: true - }, { - acl: "private", - objectOwnership: "BucketOwnerPreferred" + objectLockEnabledForBucket: true, + extra: { + acl: "private" + } }) expect(config.integration.client.createBucket).toHaveBeenCalledWith({ Bucket: "test", @@ -53,12 +53,25 @@ describe("S3 Integration", () => { }, GrantFullControl: "me", GrantRead: "him", - GrantReadAcp: "her", + GrantReadACP: "her", GrantWrite: "she", - GrantWriteAcp: "he", - ObjectLockEnabledForBucket: true, + GrantWriteACP: "he", ACL: "private", - ObjectOwnership: "BucketOwnerPreferred" + }) + }) + + it("does not add undefined location constraint when calling the create method", async () => { + await config.integration.create({ + bucket: "test" + }) + expect(config.integration.client.createBucket).toHaveBeenCalledWith({ + Bucket: "test", + GrantFullControl: undefined, + GrantRead: undefined, + GrantReadACP: undefined, + GrantWrite: undefined, + GrantWriteACP: undefined, + ACL: undefined, }) }) }) \ No newline at end of file From 0e44703e95ec1f1e5547e9e2b72afe999474eff2 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 30 Aug 2022 19:56:08 +0100 Subject: [PATCH 08/21] Delete method S3 Bucket --- packages/server/__mocks__/aws-sdk.ts | 7 ++++ packages/server/src/integrations/s3.ts | 25 ++++++++++++-- .../server/src/integrations/tests/s3.spec.js | 33 +++++++++++++++++++ 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/packages/server/__mocks__/aws-sdk.ts b/packages/server/__mocks__/aws-sdk.ts index 24873ac174..b0da0e97b6 100644 --- a/packages/server/__mocks__/aws-sdk.ts +++ b/packages/server/__mocks__/aws-sdk.ts @@ -44,6 +44,13 @@ module AwsMock { Contents: {}, }) ) + + // @ts-ignore + this.deleteObjects = jest.fn( + response({ + Contents: {}, + }) + ) } aws.DynamoDB = { DocumentClient } diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index b717ece222..72e664fe16 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -119,6 +119,19 @@ module S3Module { }, }, }, + delete: { + type: QueryType.FIELDS, + fields: { + bucket: { + type: DatasourceFieldType.STRING, + required: true, + }, + delete: { + type: DatasourceFieldType.JSON, + required: true, + }, + }, + } }, extra: { acl: { @@ -178,8 +191,7 @@ module S3Module { LocationConstraint: query.location, } } - const response = await this.client.createBucket(params).promise() - return response + return await this.client.createBucket(params).promise() } async read(query: { @@ -231,6 +243,15 @@ module S3Module { } }) } + + async delete(query: { bucket: string, delete: string }) { + return await this.client + .deleteObjects({ + Bucket: query.bucket, + Delete: JSON.parse(query.delete), + }) + .promise() + } } module.exports = { diff --git a/packages/server/src/integrations/tests/s3.spec.js b/packages/server/src/integrations/tests/s3.spec.js index 26a87fa99f..fc2477a225 100644 --- a/packages/server/src/integrations/tests/s3.spec.js +++ b/packages/server/src/integrations/tests/s3.spec.js @@ -74,4 +74,37 @@ describe("S3 Integration", () => { ACL: undefined, }) }) + + it("calls the delete method with the correct params ", async () => { + await config.integration.delete({ + bucket: "test", + delete: `{ + "Objects": [ + { + "Key": "HappyFace.jpg", + "VersionId": "2LWg7lQLnY41.maGB5Z6SWW.dcq0vx7b" + }, + { + "Key": "HappyFace.jpg", + "VersionId": "yoz3HB.ZhCS_tKVEmIOr7qYyyAaZSKVd" + } + ] + }` + }) + expect(config.integration.client.deleteObjects).toHaveBeenCalledWith({ + Bucket: "test", + Delete: { + Objects: [ + { + Key: "HappyFace.jpg", + VersionId: "2LWg7lQLnY41.maGB5Z6SWW.dcq0vx7b" + }, + { + Key: "HappyFace.jpg", + VersionId: "yoz3HB.ZhCS_tKVEmIOr7qYyyAaZSKVd" + } + ] + } + }) + }) }) \ No newline at end of file From b11b3c11fbd37262be2b70706d5b3fb34dc60b4e Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 30 Aug 2022 19:56:38 +0100 Subject: [PATCH 09/21] lint --- packages/server/src/integrations/s3.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index 72e664fe16..2ff594495d 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -131,7 +131,7 @@ module S3Module { required: true, }, }, - } + }, }, extra: { acl: { @@ -244,13 +244,13 @@ module S3Module { }) } - async delete(query: { bucket: string, delete: string }) { + async delete(query: { bucket: string; delete: string }) { return await this.client - .deleteObjects({ - Bucket: query.bucket, - Delete: JSON.parse(query.delete), - }) - .promise() + .deleteObjects({ + Bucket: query.bucket, + Delete: JSON.parse(query.delete), + }) + .promise() } } From 1ac362f90ce24f8a122dc1bc5fd6a2d23667c87d Mon Sep 17 00:00:00 2001 From: chaoticefx <79575739+chaoticefx@users.noreply.github.com> Date: Tue, 25 Oct 2022 11:59:34 +0800 Subject: [PATCH 10/21] Implemented custom ssl config in elasticsearch.ts --- .../server/src/integrations/elasticsearch.ts | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/packages/server/src/integrations/elasticsearch.ts b/packages/server/src/integrations/elasticsearch.ts index 14887a743d..0bd463606f 100644 --- a/packages/server/src/integrations/elasticsearch.ts +++ b/packages/server/src/integrations/elasticsearch.ts @@ -9,6 +9,9 @@ const { Client } = require("@elastic/elasticsearch") interface ElasticsearchConfig { url: string + ssl?: boolean + ca?: string + rejectUnauthorized?: boolean } const SCHEMA: Integration = { @@ -23,6 +26,21 @@ const SCHEMA: Integration = { required: true, default: "http://localhost:9200", }, + ssl: { + type: DatasourceFieldType.BOOLEAN, + default: false, + required: false, + }, + rejectUnauthorized: { + type: DatasourceFieldType.BOOLEAN, + default: true, + required: false, + }, + ca: { + type: DatasourceFieldType.LONGFORM, + default: false, + required: false, + }, }, query: { create: { @@ -81,7 +99,25 @@ class ElasticSearchIntegration implements IntegrationBase { constructor(config: ElasticsearchConfig) { this.config = config - this.client = new Client({ node: config.url }) + + let newConfig = { + node: this.config.url, + ssl: this.config.ssl + ? { + rejectUnauthorized: this.config.rejectUnauthorized, + ca: this.config.ca ? this.config.ca : undefined + } + : undefined, + } + + if (newConfig.ssl && !newConfig.ssl.ca) + { + delete newConfig.ssl.ca + } else if(!newConfig.ssl) + { + delete newConfig.ssl + } + this.client = new Client(newConfig) } async create(query: { index: string; json: object }) { From 86fef02567986cf059f2a1680da1b28322e5d961 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 26 Oct 2022 16:44:25 +0100 Subject: [PATCH 11/21] lint --- packages/server/src/integrations/s3.ts | 419 +++++++++--------- .../server/src/integrations/tests/s3.spec.ts | 36 +- 2 files changed, 227 insertions(+), 228 deletions(-) diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index 5a3cc32b4e..b965b177d0 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -5,9 +5,8 @@ import { DatasourceFieldType, } from "@budibase/types" -module S3Module { - const AWS = require("aws-sdk") - const csv = require("csvtojson") +const AWS = require("aws-sdk") +const csv = require("csvtojson") interface S3Config { region: string @@ -17,138 +16,138 @@ interface S3Config { endpoint?: string } - const SCHEMA: Integration = { - docs: "https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html", - description: - "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", - datasource: { - region: { - type: "string", - required: false, - default: "us-east-1", - }, - accessKeyId: { - type: "password", - required: true, - }, - secretAccessKey: { - type: "password", - required: true, - }, - endpoint: { - type: "string", - required: false, - }, - signatureVersion: { - type: "string", - required: false, - default: "v4", - }, +const SCHEMA: Integration = { + docs: "https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html", + description: + "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", + datasource: { + region: { + type: "string", + required: false, + default: "us-east-1", }, - query: { - create: { - type: QueryType.FIELDS, - fields: { - bucket: { - display: "New Bucket", - type: DatasourceFieldType.STRING, - required: true, - }, - location: { - required: true, - default: "us-east-1", - type: DatasourceFieldType.STRING, - }, - grantFullControl: { - display: "Grant full control", - type: DatasourceFieldType.STRING, - }, - grantRead: { - display: "Grant read", - type: DatasourceFieldType.STRING, - }, - grantReadAcp: { - display: "Grant read ACP", - type: DatasourceFieldType.STRING, - }, - grantWrite: { - display: "Grant write", - type: DatasourceFieldType.STRING, - }, - grantWriteAcp: { - display: "Grant write ACP", - type: DatasourceFieldType.STRING, - }, + accessKeyId: { + type: "password", + required: true, + }, + secretAccessKey: { + type: "password", + required: true, + }, + endpoint: { + type: "string", + required: false, + }, + signatureVersion: { + type: "string", + required: false, + default: "v4", + }, + }, + query: { + create: { + type: QueryType.FIELDS, + fields: { + bucket: { + display: "New Bucket", + type: DatasourceFieldType.STRING, + required: true, }, - }, - read: { - type: QueryType.FIELDS, - fields: { - bucket: { - type: DatasourceFieldType.STRING, - required: true, - }, - delimiter: { - type: DatasourceFieldType.STRING, - }, - marker: { - type: DatasourceFieldType.STRING, - }, - maxKeys: { - type: DatasourceFieldType.NUMBER, - display: "Max Keys", - }, - prefix: { - type: DatasourceFieldType.STRING, - }, + location: { + required: true, + default: "us-east-1", + type: DatasourceFieldType.STRING, }, - }, - readCsv: { - displayName: "Read CSV", - type: QueryType.FIELDS, - fields: { - bucket: { - type: DatasourceFieldType.STRING, - required: true, - }, - key: { - type: DatasourceFieldType.STRING, - required: true, - }, + grantFullControl: { + display: "Grant full control", + type: DatasourceFieldType.STRING, }, - }, - delete: { - type: QueryType.FIELDS, - fields: { - bucket: { - type: DatasourceFieldType.STRING, - required: true, - }, - delete: { - type: DatasourceFieldType.JSON, - required: true, - }, + grantRead: { + display: "Grant read", + type: DatasourceFieldType.STRING, + }, + grantReadAcp: { + display: "Grant read ACP", + type: DatasourceFieldType.STRING, + }, + grantWrite: { + display: "Grant write", + type: DatasourceFieldType.STRING, + }, + grantWriteAcp: { + display: "Grant write ACP", + type: DatasourceFieldType.STRING, }, }, }, - extra: { - acl: { - required: false, - displayName: "ACL", - type: DatasourceFieldType.LIST, - data: { - create: [ - "private", - "public-read", - "public-read-write", - "authenticated-read", - ], + read: { + type: QueryType.FIELDS, + fields: { + bucket: { + type: DatasourceFieldType.STRING, + required: true, + }, + delimiter: { + type: DatasourceFieldType.STRING, + }, + marker: { + type: DatasourceFieldType.STRING, + }, + maxKeys: { + type: DatasourceFieldType.NUMBER, + display: "Max Keys", + }, + prefix: { + type: DatasourceFieldType.STRING, }, }, }, - } + readCsv: { + displayName: "Read CSV", + type: QueryType.FIELDS, + fields: { + bucket: { + type: DatasourceFieldType.STRING, + required: true, + }, + key: { + type: DatasourceFieldType.STRING, + required: true, + }, + }, + }, + delete: { + type: QueryType.FIELDS, + fields: { + bucket: { + type: DatasourceFieldType.STRING, + required: true, + }, + delete: { + type: DatasourceFieldType.JSON, + required: true, + }, + }, + }, + }, + extra: { + acl: { + required: false, + displayName: "ACL", + type: DatasourceFieldType.LIST, + data: { + create: [ + "private", + "public-read", + "public-read-write", + "authenticated-read", + ], + }, + }, + }, +} class S3Integration implements IntegrationBase { private readonly config: S3Config @@ -165,95 +164,95 @@ class S3Integration implements IntegrationBase { this.client = new AWS.S3(this.config) } - async create(query: { - bucket: string - location: string - grantFullControl: string - grantRead: string - grantReadAcp: string - grantWrite: string - grantWriteAcp: string - extra: { - acl: string + async create(query: { + bucket: string + location: string + grantFullControl: string + grantRead: string + grantReadAcp: string + grantWrite: string + grantWriteAcp: string + extra: { + acl: string + } + }) { + let params: any = { + Bucket: query.bucket, + ACL: query.extra?.acl, + GrantFullControl: query.grantFullControl, + GrantRead: query.grantRead, + GrantReadACP: query.grantReadAcp, + GrantWrite: query.grantWrite, + GrantWriteACP: query.grantWriteAcp, + } + if (query.location) { + params["CreateBucketConfiguration"] = { + LocationConstraint: query.location, } - }) { - let params: any = { - Bucket: query.bucket, - ACL: query.extra?.acl, - GrantFullControl: query.grantFullControl, - GrantRead: query.grantRead, - GrantReadACP: query.grantReadAcp, - GrantWrite: query.grantWrite, - GrantWriteACP: query.grantWriteAcp, - } - if (query.location) { - params["CreateBucketConfiguration"] = { - LocationConstraint: query.location, - } - } - return await this.client.createBucket(params).promise() - } - - async read(query: { - bucket: string - delimiter: string - expectedBucketOwner: string - marker: string - maxKeys: number - prefix: string - }) { - const response = await this.client - .listObjects({ - Bucket: query.bucket, - Delimiter: query.delimiter, - Marker: query.marker, - MaxKeys: query.maxKeys, - Prefix: query.prefix, - }) - .promise() - return response.Contents - } - - async readCsv(query: { bucket: string; key: string }) { - const stream = this.client - .getObject({ - Bucket: query.bucket, - Key: query.key, - }) - .createReadStream() - - let csvError = false - return new Promise((resolve, reject) => { - stream.on("error", (err: Error) => { - reject(err) - }) - const response = csv() - .fromStream(stream) - .on("error", () => { - csvError = true - }) - stream.on("finish", () => { - resolve(response) - }) - }).catch(err => { - if (csvError) { - throw new Error("Could not read CSV") - } else { - throw err - } - }) - } - - async delete(query: { bucket: string; delete: string }) { - return await this.client - .deleteObjects({ - Bucket: query.bucket, - Delete: JSON.parse(query.delete), - }) - .promise() } + return await this.client.createBucket(params).promise() } + async read(query: { + bucket: string + delimiter: string + expectedBucketOwner: string + marker: string + maxKeys: number + prefix: string + }) { + const response = await this.client + .listObjects({ + Bucket: query.bucket, + Delimiter: query.delimiter, + Marker: query.marker, + MaxKeys: query.maxKeys, + Prefix: query.prefix, + }) + .promise() + return response.Contents + } + + async readCsv(query: { bucket: string; key: string }) { + const stream = this.client + .getObject({ + Bucket: query.bucket, + Key: query.key, + }) + .createReadStream() + + let csvError = false + return new Promise((resolve, reject) => { + stream.on("error", (err: Error) => { + reject(err) + }) + const response = csv() + .fromStream(stream) + .on("error", () => { + csvError = true + }) + stream.on("finish", () => { + resolve(response) + }) + }).catch(err => { + if (csvError) { + throw new Error("Could not read CSV") + } else { + throw err + } + }) + } + + async delete(query: { bucket: string; delete: string }) { + return await this.client + .deleteObjects({ + Bucket: query.bucket, + Delete: JSON.parse(query.delete), + }) + .promise() + } +} + export default { schema: SCHEMA, integration: S3Integration, diff --git a/packages/server/src/integrations/tests/s3.spec.ts b/packages/server/src/integrations/tests/s3.spec.ts index 592ae632bf..35107adefe 100644 --- a/packages/server/src/integrations/tests/s3.spec.ts +++ b/packages/server/src/integrations/tests/s3.spec.ts @@ -18,7 +18,7 @@ describe("S3 Integration", () => { }) it("calls the read method with the correct params", async () => { - await config.integration.read({ + await config.integration.read({ bucket: "test", delimiter: "/", marker: "file.txt", @@ -30,12 +30,12 @@ describe("S3 Integration", () => { Delimiter: "/", Marker: "file.txt", MaxKeys: 999, - Prefix: "directory/" + Prefix: "directory/", }) }) it("calls the create method with the correct params", async () => { - await config.integration.create({ + await config.integration.create({ bucket: "test", location: "af-south-1", grantFullControl: "me", @@ -45,13 +45,13 @@ describe("S3 Integration", () => { grantWriteAcp: "he", objectLockEnabledForBucket: true, extra: { - acl: "private" - } + acl: "private", + }, }) expect(config.integration.client.createBucket).toHaveBeenCalledWith({ Bucket: "test", CreateBucketConfiguration: { - LocationConstraint: "af-south-1" + LocationConstraint: "af-south-1", }, GrantFullControl: "me", GrantRead: "him", @@ -63,8 +63,8 @@ describe("S3 Integration", () => { }) it("does not add undefined location constraint when calling the create method", async () => { - await config.integration.create({ - bucket: "test" + await config.integration.create({ + bucket: "test", }) expect(config.integration.client.createBucket).toHaveBeenCalledWith({ Bucket: "test", @@ -78,7 +78,7 @@ describe("S3 Integration", () => { }) it("calls the delete method with the correct params ", async () => { - await config.integration.delete({ + await config.integration.delete({ bucket: "test", delete: `{ "Objects": [ @@ -91,22 +91,22 @@ describe("S3 Integration", () => { "VersionId": "yoz3HB.ZhCS_tKVEmIOr7qYyyAaZSKVd" } ] - }` + }`, }) expect(config.integration.client.deleteObjects).toHaveBeenCalledWith({ Bucket: "test", Delete: { Objects: [ { - Key: "HappyFace.jpg", - VersionId: "2LWg7lQLnY41.maGB5Z6SWW.dcq0vx7b" - }, + Key: "HappyFace.jpg", + VersionId: "2LWg7lQLnY41.maGB5Z6SWW.dcq0vx7b", + }, { - Key: "HappyFace.jpg", - VersionId: "yoz3HB.ZhCS_tKVEmIOr7qYyyAaZSKVd" - } - ] - } + Key: "HappyFace.jpg", + VersionId: "yoz3HB.ZhCS_tKVEmIOr7qYyyAaZSKVd", + }, + ], + }, }) }) }) From ac9c52e70fba54ea4e4e6d1c107bcff002b86dfb Mon Sep 17 00:00:00 2001 From: chaoticefx <79575739+chaoticefx@users.noreply.github.com> Date: Thu, 27 Oct 2022 15:52:49 +0800 Subject: [PATCH 12/21] Fixed code styling --- packages/server/src/integrations/elasticsearch.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/server/src/integrations/elasticsearch.ts b/packages/server/src/integrations/elasticsearch.ts index 0bd463606f..51e13b37fa 100644 --- a/packages/server/src/integrations/elasticsearch.ts +++ b/packages/server/src/integrations/elasticsearch.ts @@ -105,16 +105,14 @@ class ElasticSearchIntegration implements IntegrationBase { ssl: this.config.ssl ? { rejectUnauthorized: this.config.rejectUnauthorized, - ca: this.config.ca ? this.config.ca : undefined + ca: this.config.ca || undefined, } : undefined, } - if (newConfig.ssl && !newConfig.ssl.ca) - { + if (newConfig.ssl && !newConfig.ssl.ca) { delete newConfig.ssl.ca - } else if(!newConfig.ssl) - { + } else if(!newConfig.ssl) { delete newConfig.ssl } this.client = new Client(newConfig) From 46a0197cd614d9f5b05d34f0f87c769f311be67f Mon Sep 17 00:00:00 2001 From: chaoticefx <79575739+chaoticefx@users.noreply.github.com> Date: Thu, 27 Oct 2022 16:24:01 +0800 Subject: [PATCH 13/21] Ran npx prettier against elasticsearch.ts --- packages/server/src/integrations/elasticsearch.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/server/src/integrations/elasticsearch.ts b/packages/server/src/integrations/elasticsearch.ts index 51e13b37fa..8cda6692a0 100644 --- a/packages/server/src/integrations/elasticsearch.ts +++ b/packages/server/src/integrations/elasticsearch.ts @@ -100,19 +100,19 @@ class ElasticSearchIntegration implements IntegrationBase { constructor(config: ElasticsearchConfig) { this.config = config - let newConfig = { + let newConfig = { node: this.config.url, - ssl: this.config.ssl + ssl: this.config.ssl ? { - rejectUnauthorized: this.config.rejectUnauthorized, - ca: this.config.ca || undefined, - } + rejectUnauthorized: this.config.rejectUnauthorized, + ca: this.config.ca || undefined, + } : undefined, } if (newConfig.ssl && !newConfig.ssl.ca) { delete newConfig.ssl.ca - } else if(!newConfig.ssl) { + } else if (!newConfig.ssl) { delete newConfig.ssl } this.client = new Client(newConfig) From bf2abfe37c6928c97a70c9ebf0eae42cdce5af13 Mon Sep 17 00:00:00 2001 From: Tom <19203795+that-one-tom@users.noreply.github.com> Date: Sat, 29 Oct 2022 11:56:16 +0200 Subject: [PATCH 14/21] Fix syntax for ellipsis helper Problem: The suggested ellipsis syntax breaks the handlebars expression due to an additional comma. Solution: Removed the comma from the help text, --- packages/string-templates/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/string-templates/manifest.json b/packages/string-templates/manifest.json index f8600121f1..f837f3aa75 100644 --- a/packages/string-templates/manifest.json +++ b/packages/string-templates/manifest.json @@ -625,7 +625,7 @@ "length" ], "numArgs": 2, - "example": "{{ellipsis 'foo bar baz', 7}} -> foo bar…", + "example": "{{ellipsis 'foo bar baz' 7}} -> foo bar…", "description": "

Truncates a string to the specified length, and appends it with an elipsis, ….

\n" }, "hyphenate": { @@ -1219,4 +1219,4 @@ "description": "

Produce a humanized duration left/until given an amount of time and the type of time measurement.

\n" } } -} \ No newline at end of file +} From a45c16bc42cf7a5729d0a8bf28038862efaeeb88 Mon Sep 17 00:00:00 2001 From: chaoticefx <79575739+chaoticefx@users.noreply.github.com> Date: Tue, 1 Nov 2022 09:08:17 +0800 Subject: [PATCH 15/21] Cleaned up config declaration in constructor --- .../server/src/integrations/elasticsearch.ts | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/packages/server/src/integrations/elasticsearch.ts b/packages/server/src/integrations/elasticsearch.ts index 8cda6692a0..c021662a41 100644 --- a/packages/server/src/integrations/elasticsearch.ts +++ b/packages/server/src/integrations/elasticsearch.ts @@ -5,7 +5,7 @@ import { IntegrationBase, } from "@budibase/types" -const { Client } = require("@elastic/elasticsearch") +import { Client, ClientOptions } from "@elastic/elasticsearch" interface ElasticsearchConfig { url: string @@ -100,22 +100,18 @@ class ElasticSearchIntegration implements IntegrationBase { constructor(config: ElasticsearchConfig) { this.config = config - let newConfig = { + const clientConfig: ClientOptions = { node: this.config.url, - ssl: this.config.ssl - ? { - rejectUnauthorized: this.config.rejectUnauthorized, - ca: this.config.ca || undefined, - } - : undefined, } - if (newConfig.ssl && !newConfig.ssl.ca) { - delete newConfig.ssl.ca - } else if (!newConfig.ssl) { - delete newConfig.ssl + if (this.config.ssl) { + clientConfig.ssl = { + rejectUnauthorized: this.config.rejectUnauthorized, + ca: this.config.ca || undefined, + } } - this.client = new Client(newConfig) + + this.client = new Client(clientConfig) } async create(query: { index: string; json: object }) { From a8ff4fea68d9fe6c3e6eb37bab20308b4f968973 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 1 Nov 2022 09:02:08 +0000 Subject: [PATCH 16/21] v2.0.40-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index e563205258..84d5683dd4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.40-alpha.0", + "version": "2.0.40-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index fdbef02f7b..082769006a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.40-alpha.0", + "version": "2.0.40-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "2.0.40-alpha.0", + "@budibase/types": "2.0.40-alpha.1", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index bb7db3ed62..6794750227 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.0.40-alpha.0", + "version": "2.0.40-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "2.0.40-alpha.0", + "@budibase/string-templates": "2.0.40-alpha.1", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index e952da0355..ce310f5bbf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.40-alpha.0", + "version": "2.0.40-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.0.40-alpha.0", - "@budibase/client": "2.0.40-alpha.0", - "@budibase/frontend-core": "2.0.40-alpha.0", - "@budibase/string-templates": "2.0.40-alpha.0", + "@budibase/bbui": "2.0.40-alpha.1", + "@budibase/client": "2.0.40-alpha.1", + "@budibase/frontend-core": "2.0.40-alpha.1", + "@budibase/string-templates": "2.0.40-alpha.1", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 4e16dddbb1..c215be2c46 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.40-alpha.0", + "version": "2.0.40-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.0.40-alpha.0", - "@budibase/string-templates": "2.0.40-alpha.0", - "@budibase/types": "2.0.40-alpha.0", + "@budibase/backend-core": "2.0.40-alpha.1", + "@budibase/string-templates": "2.0.40-alpha.1", + "@budibase/types": "2.0.40-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 7df2f3ff7b..d18e2aee12 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.40-alpha.0", + "version": "2.0.40-alpha.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.0.40-alpha.0", - "@budibase/frontend-core": "2.0.40-alpha.0", - "@budibase/string-templates": "2.0.40-alpha.0", + "@budibase/bbui": "2.0.40-alpha.1", + "@budibase/frontend-core": "2.0.40-alpha.1", + "@budibase/string-templates": "2.0.40-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 3f49d6f4f7..7670eb81f1 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.40-alpha.0", + "version": "2.0.40-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.0.40-alpha.0", + "@budibase/bbui": "2.0.40-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 475c47bdab..5f6a9023fb 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.40-alpha.0", + "version": "2.0.40-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 847a03ba07..9cf87b49a8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.40-alpha.0", + "version": "2.0.40-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.0.40-alpha.0", - "@budibase/client": "2.0.40-alpha.0", + "@budibase/backend-core": "2.0.40-alpha.1", + "@budibase/client": "2.0.40-alpha.1", "@budibase/pro": "2.0.40-alpha.0", - "@budibase/string-templates": "2.0.40-alpha.0", - "@budibase/types": "2.0.40-alpha.0", + "@budibase/string-templates": "2.0.40-alpha.1", + "@budibase/types": "2.0.40-alpha.1", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 5989aec936..f2524f26ba 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.40-alpha.0", + "version": "2.0.40-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 17e45c20d3..8a936a894f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.40-alpha.0", + "version": "2.0.40-alpha.1", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index ede5aa8786..19f5bb1bf4 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.40-alpha.0", + "version": "2.0.40-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.0.40-alpha.0", + "@budibase/backend-core": "2.0.40-alpha.1", "@budibase/pro": "2.0.40-alpha.0", - "@budibase/string-templates": "2.0.40-alpha.0", - "@budibase/types": "2.0.40-alpha.0", + "@budibase/string-templates": "2.0.40-alpha.1", + "@budibase/types": "2.0.40-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 83056d5cad2eca92fc47d1cac46347803b08c09d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 1 Nov 2022 09:06:05 +0000 Subject: [PATCH 17/21] Update pro version to 2.0.40-alpha.1 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 9cf87b49a8..cd9eb977e3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.0.40-alpha.1", "@budibase/client": "2.0.40-alpha.1", - "@budibase/pro": "2.0.40-alpha.0", + "@budibase/pro": "2.0.40-alpha.1", "@budibase/string-templates": "2.0.40-alpha.1", "@budibase/types": "2.0.40-alpha.1", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 3b76c97d10..beb431bfaf 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.40-alpha.0": - version "2.0.40-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.0.tgz#197df7756b8352bbda189e0f497b8df64a4a09de" - integrity sha512-7HjMzpSMDcxgJwUrWvibK0Koj348JyAkMhtSjGxj7s8lhu+z9GcqiWNHssx5sdramShmbSkcNny5vnM+A9w+tQ== +"@budibase/backend-core@2.0.40-alpha.1": + version "2.0.40-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.1.tgz#daa202ec3c78ae145e387b9cac6781b522e73a77" + integrity sha512-Yf9dORri5LScJJ87yb7S4XPUQtl2ohkAh6RLyi66ofRkdnYgNsOjxgDjzxSpVLRO2GjKVCwmlj1xIw4FyP+kAA== dependencies: - "@budibase/types" "2.0.40-alpha.0" + "@budibase/types" "2.0.40-alpha.1" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.40-alpha.0": - version "2.0.40-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.0.tgz#748fdad163159cc04b5b2b3103179c9e3bb22ab1" - integrity sha512-brBVT2B/nzZw8iYnC6Xhu0+x3JprgEsN1s40tQaYbVAvXB6GuHCtnkJ6mDoGDB5xQTilNdx+xNfF/qpZQv7h9w== +"@budibase/pro@2.0.40-alpha.1": + version "2.0.40-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.1.tgz#34eb0ac04cea43d0f55c8843f85868d954e92994" + integrity sha512-ncwo/hbVY7eC6pRy6VJm7+//xqsTyShVJx2gmDHbclbWODVC5dqsy0N2MzrcSwYZpsukHr1xh1zly2qcxrmpcQ== dependencies: - "@budibase/backend-core" "2.0.40-alpha.0" - "@budibase/types" "2.0.40-alpha.0" + "@budibase/backend-core" "2.0.40-alpha.1" + "@budibase/types" "2.0.40-alpha.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.40-alpha.0": - version "2.0.40-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.0.tgz#22664329f7662cbf6fc4755f08fb1e6eed65f8c7" - integrity sha512-Z/PZrzkiK4MfsngSzyYmCnYHcGmTQci6achej3q2qPtnG7+AZpmTDszovznMytfyNA+TMvFesECzBy1p+KBTDQ== +"@budibase/types@2.0.40-alpha.1": + version "2.0.40-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.1.tgz#63ada186adaf42a47414783872ce176e73f3bb96" + integrity sha512-lGP0eGxqr2w+inhd+FVgzNFUrYqBVWj5WFrQSJEEEnkFfVMS4wHAzNdmAuUmiiK8rR4t06dD1RclYMBTTy0dUg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 19f5bb1bf4..b1b7ec1564 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.0.40-alpha.1", - "@budibase/pro": "2.0.40-alpha.0", + "@budibase/pro": "2.0.40-alpha.1", "@budibase/string-templates": "2.0.40-alpha.1", "@budibase/types": "2.0.40-alpha.1", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 932ad82946..6fef7709a3 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.40-alpha.0": - version "2.0.40-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.0.tgz#197df7756b8352bbda189e0f497b8df64a4a09de" - integrity sha512-7HjMzpSMDcxgJwUrWvibK0Koj348JyAkMhtSjGxj7s8lhu+z9GcqiWNHssx5sdramShmbSkcNny5vnM+A9w+tQ== +"@budibase/backend-core@2.0.40-alpha.1": + version "2.0.40-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.1.tgz#daa202ec3c78ae145e387b9cac6781b522e73a77" + integrity sha512-Yf9dORri5LScJJ87yb7S4XPUQtl2ohkAh6RLyi66ofRkdnYgNsOjxgDjzxSpVLRO2GjKVCwmlj1xIw4FyP+kAA== dependencies: - "@budibase/types" "2.0.40-alpha.0" + "@budibase/types" "2.0.40-alpha.1" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.40-alpha.0": - version "2.0.40-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.0.tgz#748fdad163159cc04b5b2b3103179c9e3bb22ab1" - integrity sha512-brBVT2B/nzZw8iYnC6Xhu0+x3JprgEsN1s40tQaYbVAvXB6GuHCtnkJ6mDoGDB5xQTilNdx+xNfF/qpZQv7h9w== +"@budibase/pro@2.0.40-alpha.1": + version "2.0.40-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.1.tgz#34eb0ac04cea43d0f55c8843f85868d954e92994" + integrity sha512-ncwo/hbVY7eC6pRy6VJm7+//xqsTyShVJx2gmDHbclbWODVC5dqsy0N2MzrcSwYZpsukHr1xh1zly2qcxrmpcQ== dependencies: - "@budibase/backend-core" "2.0.40-alpha.0" - "@budibase/types" "2.0.40-alpha.0" + "@budibase/backend-core" "2.0.40-alpha.1" + "@budibase/types" "2.0.40-alpha.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.40-alpha.0": - version "2.0.40-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.0.tgz#22664329f7662cbf6fc4755f08fb1e6eed65f8c7" - integrity sha512-Z/PZrzkiK4MfsngSzyYmCnYHcGmTQci6achej3q2qPtnG7+AZpmTDszovznMytfyNA+TMvFesECzBy1p+KBTDQ== +"@budibase/types@2.0.40-alpha.1": + version "2.0.40-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.1.tgz#63ada186adaf42a47414783872ce176e73f3bb96" + integrity sha512-lGP0eGxqr2w+inhd+FVgzNFUrYqBVWj5WFrQSJEEEnkFfVMS4wHAzNdmAuUmiiK8rR4t06dD1RclYMBTTy0dUg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From d6b95937bda89f83cd7ed7b6ceb88d8ca2cad3c5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 1 Nov 2022 10:04:48 +0000 Subject: [PATCH 18/21] v2.0.40-alpha.2 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/lerna.json b/lerna.json index 84d5683dd4..40f98112c5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.40-alpha.1", + "version": "2.0.40-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 082769006a..f4f2de1316 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.40-alpha.1", + "version": "2.0.40-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "2.0.40-alpha.1", + "@budibase/types": "2.0.40-alpha.2", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6794750227..455791d165 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.0.40-alpha.1", + "version": "2.0.40-alpha.2", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "2.0.40-alpha.1", + "@budibase/string-templates": "2.0.40-alpha.2", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index ce310f5bbf..27ffa24b64 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.40-alpha.1", + "version": "2.0.40-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.0.40-alpha.1", - "@budibase/client": "2.0.40-alpha.1", - "@budibase/frontend-core": "2.0.40-alpha.1", - "@budibase/string-templates": "2.0.40-alpha.1", + "@budibase/bbui": "2.0.40-alpha.2", + "@budibase/client": "2.0.40-alpha.2", + "@budibase/frontend-core": "2.0.40-alpha.2", + "@budibase/string-templates": "2.0.40-alpha.2", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index c215be2c46..6fef6711cd 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.40-alpha.1", + "version": "2.0.40-alpha.2", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.0.40-alpha.1", - "@budibase/string-templates": "2.0.40-alpha.1", - "@budibase/types": "2.0.40-alpha.1", + "@budibase/backend-core": "2.0.40-alpha.2", + "@budibase/string-templates": "2.0.40-alpha.2", + "@budibase/types": "2.0.40-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 d18e2aee12..7fc9b1319a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.40-alpha.1", + "version": "2.0.40-alpha.2", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.0.40-alpha.1", - "@budibase/frontend-core": "2.0.40-alpha.1", - "@budibase/string-templates": "2.0.40-alpha.1", + "@budibase/bbui": "2.0.40-alpha.2", + "@budibase/frontend-core": "2.0.40-alpha.2", + "@budibase/string-templates": "2.0.40-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 7670eb81f1..68a794baf3 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.40-alpha.1", + "version": "2.0.40-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.0.40-alpha.1", + "@budibase/bbui": "2.0.40-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 5f6a9023fb..7db675066c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.40-alpha.1", + "version": "2.0.40-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 306a86273b..b4bedfec84 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.40-alpha.1", + "version": "2.0.40-alpha.2", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.0.40-alpha.1", - "@budibase/client": "2.0.40-alpha.1", + "@budibase/backend-core": "2.0.40-alpha.2", + "@budibase/client": "2.0.40-alpha.2", "@budibase/pro": "2.0.40-alpha.1", - "@budibase/string-templates": "2.0.40-alpha.1", - "@budibase/types": "2.0.40-alpha.1", + "@budibase/string-templates": "2.0.40-alpha.2", + "@budibase/types": "2.0.40-alpha.2", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", @@ -200,4 +200,4 @@ "oracledb": "5.3.0" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index f2524f26ba..a52348ead8 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.40-alpha.1", + "version": "2.0.40-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 8a936a894f..29ac0eb9eb 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.40-alpha.1", + "version": "2.0.40-alpha.2", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index b1b7ec1564..6a01a10ae2 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.40-alpha.1", + "version": "2.0.40-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.0.40-alpha.1", + "@budibase/backend-core": "2.0.40-alpha.2", "@budibase/pro": "2.0.40-alpha.1", - "@budibase/string-templates": "2.0.40-alpha.1", - "@budibase/types": "2.0.40-alpha.1", + "@budibase/string-templates": "2.0.40-alpha.2", + "@budibase/types": "2.0.40-alpha.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From a0650fc229f4bf7648112aca2b9159af972d6df1 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 1 Nov 2022 10:07:20 +0000 Subject: [PATCH 19/21] Update pro version to 2.0.40-alpha.2 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 32 ++++++++++++++++---------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index b4bedfec84..27145453df 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.0.40-alpha.2", "@budibase/client": "2.0.40-alpha.2", - "@budibase/pro": "2.0.40-alpha.1", + "@budibase/pro": "2.0.40-alpha.2", "@budibase/string-templates": "2.0.40-alpha.2", "@budibase/types": "2.0.40-alpha.2", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 36ccb0bd65..27bf3abb3b 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.40-alpha.1": - version "2.0.40-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.1.tgz#daa202ec3c78ae145e387b9cac6781b522e73a77" - integrity sha512-Yf9dORri5LScJJ87yb7S4XPUQtl2ohkAh6RLyi66ofRkdnYgNsOjxgDjzxSpVLRO2GjKVCwmlj1xIw4FyP+kAA== +"@budibase/backend-core@2.0.40-alpha.2": + version "2.0.40-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.2.tgz#aa0b25232b3c6f02112b9a95d79bd445be634016" + integrity sha512-BixStMP42LRetHULORPt8ysqvL9SdxtWQmg3mqxdmY+v+W08a44Z7uKKzphUvhJN5tSd1vuT1Lc2EYPVaI0dfQ== dependencies: - "@budibase/types" "2.0.40-alpha.1" + "@budibase/types" "2.0.40-alpha.2" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.40-alpha.1": - version "2.0.40-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.1.tgz#34eb0ac04cea43d0f55c8843f85868d954e92994" - integrity sha512-ncwo/hbVY7eC6pRy6VJm7+//xqsTyShVJx2gmDHbclbWODVC5dqsy0N2MzrcSwYZpsukHr1xh1zly2qcxrmpcQ== +"@budibase/pro@2.0.40-alpha.2": + version "2.0.40-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.2.tgz#f2c6b081d6a62611e469d70699ffab71c687abda" + integrity sha512-ZGN/Msv1HbczkwCGxak/XJAlgfEys8Yk+GOiD2rUstc7LHqi/2jJ0K43qVe2r3serSPFcNNAUphrR3BBZp5J4Q== dependencies: - "@budibase/backend-core" "2.0.40-alpha.1" - "@budibase/types" "2.0.40-alpha.1" + "@budibase/backend-core" "2.0.40-alpha.2" + "@budibase/types" "2.0.40-alpha.2" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.40-alpha.1": - version "2.0.40-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.1.tgz#63ada186adaf42a47414783872ce176e73f3bb96" - integrity sha512-lGP0eGxqr2w+inhd+FVgzNFUrYqBVWj5WFrQSJEEEnkFfVMS4wHAzNdmAuUmiiK8rR4t06dD1RclYMBTTy0dUg== +"@budibase/types@2.0.40-alpha.2": + version "2.0.40-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.2.tgz#89e79547a376e59b56875edcbfded1425e3d85e8" + integrity sha512-ddjWF2OQJSevwNkaTDwxUaiSdImgjdZXRtjRmhsLazvc1EwKRrAejnoDa/vD9JKI1l/+si7gG4XyhHumAFkf9Q== "@bull-board/api@3.7.0": version "3.7.0" @@ -5172,7 +5172,7 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csvtojson@^2.0.10: +csvtojson@2.0.10: version "2.0.10" resolved "https://registry.yarnpkg.com/csvtojson/-/csvtojson-2.0.10.tgz#11e7242cc630da54efce7958a45f443210357574" integrity sha512-lUWFxGKyhraKCW8Qghz6Z0f2l/PqB1W3AO0HKJzGIQ5JRSlR651ekJDiGJbBT4sRNNv5ddnSGVEnsxP9XRCVpQ== diff --git a/packages/worker/package.json b/packages/worker/package.json index 6a01a10ae2..7d8c836f5b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.0.40-alpha.2", - "@budibase/pro": "2.0.40-alpha.1", + "@budibase/pro": "2.0.40-alpha.2", "@budibase/string-templates": "2.0.40-alpha.2", "@budibase/types": "2.0.40-alpha.2", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 6fef7709a3..496354d1e4 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.40-alpha.1": - version "2.0.40-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.1.tgz#daa202ec3c78ae145e387b9cac6781b522e73a77" - integrity sha512-Yf9dORri5LScJJ87yb7S4XPUQtl2ohkAh6RLyi66ofRkdnYgNsOjxgDjzxSpVLRO2GjKVCwmlj1xIw4FyP+kAA== +"@budibase/backend-core@2.0.40-alpha.2": + version "2.0.40-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.2.tgz#aa0b25232b3c6f02112b9a95d79bd445be634016" + integrity sha512-BixStMP42LRetHULORPt8ysqvL9SdxtWQmg3mqxdmY+v+W08a44Z7uKKzphUvhJN5tSd1vuT1Lc2EYPVaI0dfQ== dependencies: - "@budibase/types" "2.0.40-alpha.1" + "@budibase/types" "2.0.40-alpha.2" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.40-alpha.1": - version "2.0.40-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.1.tgz#34eb0ac04cea43d0f55c8843f85868d954e92994" - integrity sha512-ncwo/hbVY7eC6pRy6VJm7+//xqsTyShVJx2gmDHbclbWODVC5dqsy0N2MzrcSwYZpsukHr1xh1zly2qcxrmpcQ== +"@budibase/pro@2.0.40-alpha.2": + version "2.0.40-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.2.tgz#f2c6b081d6a62611e469d70699ffab71c687abda" + integrity sha512-ZGN/Msv1HbczkwCGxak/XJAlgfEys8Yk+GOiD2rUstc7LHqi/2jJ0K43qVe2r3serSPFcNNAUphrR3BBZp5J4Q== dependencies: - "@budibase/backend-core" "2.0.40-alpha.1" - "@budibase/types" "2.0.40-alpha.1" + "@budibase/backend-core" "2.0.40-alpha.2" + "@budibase/types" "2.0.40-alpha.2" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.40-alpha.1": - version "2.0.40-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.1.tgz#63ada186adaf42a47414783872ce176e73f3bb96" - integrity sha512-lGP0eGxqr2w+inhd+FVgzNFUrYqBVWj5WFrQSJEEEnkFfVMS4wHAzNdmAuUmiiK8rR4t06dD1RclYMBTTy0dUg== +"@budibase/types@2.0.40-alpha.2": + version "2.0.40-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.2.tgz#89e79547a376e59b56875edcbfded1425e3d85e8" + integrity sha512-ddjWF2OQJSevwNkaTDwxUaiSdImgjdZXRtjRmhsLazvc1EwKRrAejnoDa/vD9JKI1l/+si7gG4XyhHumAFkf9Q== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From ea002718d7e50cb632defe46a39f648b27d1fbc7 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 1 Nov 2022 11:00:08 +0000 Subject: [PATCH 20/21] v2.0.40-alpha.3 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 40f98112c5..7320f643a9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.40-alpha.2", + "version": "2.0.40-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f4f2de1316..1324f21eee 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.0.40-alpha.2", + "version": "2.0.40-alpha.3", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "2.0.40-alpha.2", + "@budibase/types": "2.0.40-alpha.3", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 455791d165..06334988d5 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.0.40-alpha.2", + "version": "2.0.40-alpha.3", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "2.0.40-alpha.2", + "@budibase/string-templates": "2.0.40-alpha.3", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 27ffa24b64..efb70d55fe 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.0.40-alpha.2", + "version": "2.0.40-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.0.40-alpha.2", - "@budibase/client": "2.0.40-alpha.2", - "@budibase/frontend-core": "2.0.40-alpha.2", - "@budibase/string-templates": "2.0.40-alpha.2", + "@budibase/bbui": "2.0.40-alpha.3", + "@budibase/client": "2.0.40-alpha.3", + "@budibase/frontend-core": "2.0.40-alpha.3", + "@budibase/string-templates": "2.0.40-alpha.3", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 6fef6711cd..00e11efc06 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.0.40-alpha.2", + "version": "2.0.40-alpha.3", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.0.40-alpha.2", - "@budibase/string-templates": "2.0.40-alpha.2", - "@budibase/types": "2.0.40-alpha.2", + "@budibase/backend-core": "2.0.40-alpha.3", + "@budibase/string-templates": "2.0.40-alpha.3", + "@budibase/types": "2.0.40-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 7fc9b1319a..81415c2ecb 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.0.40-alpha.2", + "version": "2.0.40-alpha.3", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.0.40-alpha.2", - "@budibase/frontend-core": "2.0.40-alpha.2", - "@budibase/string-templates": "2.0.40-alpha.2", + "@budibase/bbui": "2.0.40-alpha.3", + "@budibase/frontend-core": "2.0.40-alpha.3", + "@budibase/string-templates": "2.0.40-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 68a794baf3..d6aa14ad4f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.0.40-alpha.2", + "version": "2.0.40-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.0.40-alpha.2", + "@budibase/bbui": "2.0.40-alpha.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7db675066c..09e155abee 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.0.40-alpha.2", + "version": "2.0.40-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 27145453df..d84f66308e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.0.40-alpha.2", + "version": "2.0.40-alpha.3", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.0.40-alpha.2", - "@budibase/client": "2.0.40-alpha.2", + "@budibase/backend-core": "2.0.40-alpha.3", + "@budibase/client": "2.0.40-alpha.3", "@budibase/pro": "2.0.40-alpha.2", - "@budibase/string-templates": "2.0.40-alpha.2", - "@budibase/types": "2.0.40-alpha.2", + "@budibase/string-templates": "2.0.40-alpha.3", + "@budibase/types": "2.0.40-alpha.3", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index a52348ead8..8491f9edf5 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.0.40-alpha.2", + "version": "2.0.40-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 29ac0eb9eb..1082899782 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.0.40-alpha.2", + "version": "2.0.40-alpha.3", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7d8c836f5b..1bdb9ced17 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.0.40-alpha.2", + "version": "2.0.40-alpha.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.0.40-alpha.2", + "@budibase/backend-core": "2.0.40-alpha.3", "@budibase/pro": "2.0.40-alpha.2", - "@budibase/string-templates": "2.0.40-alpha.2", - "@budibase/types": "2.0.40-alpha.2", + "@budibase/string-templates": "2.0.40-alpha.3", + "@budibase/types": "2.0.40-alpha.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 3bb0538d693c9c627a5a231a410823769d62c873 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 1 Nov 2022 11:04:06 +0000 Subject: [PATCH 21/21] Update pro version to 2.0.40-alpha.3 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index d84f66308e..67946517bb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.0.40-alpha.3", "@budibase/client": "2.0.40-alpha.3", - "@budibase/pro": "2.0.40-alpha.2", + "@budibase/pro": "2.0.40-alpha.3", "@budibase/string-templates": "2.0.40-alpha.3", "@budibase/types": "2.0.40-alpha.3", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 27bf3abb3b..ee5a4a6119 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.40-alpha.2": - version "2.0.40-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.2.tgz#aa0b25232b3c6f02112b9a95d79bd445be634016" - integrity sha512-BixStMP42LRetHULORPt8ysqvL9SdxtWQmg3mqxdmY+v+W08a44Z7uKKzphUvhJN5tSd1vuT1Lc2EYPVaI0dfQ== +"@budibase/backend-core@2.0.40-alpha.3": + version "2.0.40-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.3.tgz#18572cf4c24a7e8e6b4158fc81ceeefde1f3117b" + integrity sha512-4h4GRAbCtLbKqAlaS7EoVzp2Jg/ny95oYsgvH/1kQLXMU67qHHrPtOctoeeQRhqMLrazQkOtt5EJrIA0m5yyyQ== dependencies: - "@budibase/types" "2.0.40-alpha.2" + "@budibase/types" "2.0.40-alpha.3" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.0.40-alpha.2": - version "2.0.40-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.2.tgz#f2c6b081d6a62611e469d70699ffab71c687abda" - integrity sha512-ZGN/Msv1HbczkwCGxak/XJAlgfEys8Yk+GOiD2rUstc7LHqi/2jJ0K43qVe2r3serSPFcNNAUphrR3BBZp5J4Q== +"@budibase/pro@2.0.40-alpha.3": + version "2.0.40-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.3.tgz#2803890c582dfca5852a7c17483d892f2404632f" + integrity sha512-N8oqjC2kZ1rzgjYPxiJriOTHu4KT+g6GSzvMSQ7SLIi0BBENO7QWhQOK1S01vJX3a8oe0oLY3JfkzxrvWvKtSQ== dependencies: - "@budibase/backend-core" "2.0.40-alpha.2" - "@budibase/types" "2.0.40-alpha.2" + "@budibase/backend-core" "2.0.40-alpha.3" + "@budibase/types" "2.0.40-alpha.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.0.40-alpha.2": - version "2.0.40-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.2.tgz#89e79547a376e59b56875edcbfded1425e3d85e8" - integrity sha512-ddjWF2OQJSevwNkaTDwxUaiSdImgjdZXRtjRmhsLazvc1EwKRrAejnoDa/vD9JKI1l/+si7gG4XyhHumAFkf9Q== +"@budibase/types@2.0.40-alpha.3": + version "2.0.40-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.3.tgz#2c1f9668f281a18e214626ccce2ce37fa7eb345a" + integrity sha512-bzmbOjVZZwPIBntM9j55EN4xhgeWVkw1zH3hRmgU3vB9t1tU1CDerWAXNktUgJdvI5YO/j7PPb0IsY/6WnYxcQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 1bdb9ced17..f5fa5a2e00 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.0.40-alpha.3", - "@budibase/pro": "2.0.40-alpha.2", + "@budibase/pro": "2.0.40-alpha.3", "@budibase/string-templates": "2.0.40-alpha.3", "@budibase/types": "2.0.40-alpha.3", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 496354d1e4..df828f73d8 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.0.40-alpha.2": - version "2.0.40-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.2.tgz#aa0b25232b3c6f02112b9a95d79bd445be634016" - integrity sha512-BixStMP42LRetHULORPt8ysqvL9SdxtWQmg3mqxdmY+v+W08a44Z7uKKzphUvhJN5tSd1vuT1Lc2EYPVaI0dfQ== +"@budibase/backend-core@2.0.40-alpha.3": + version "2.0.40-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.3.tgz#18572cf4c24a7e8e6b4158fc81ceeefde1f3117b" + integrity sha512-4h4GRAbCtLbKqAlaS7EoVzp2Jg/ny95oYsgvH/1kQLXMU67qHHrPtOctoeeQRhqMLrazQkOtt5EJrIA0m5yyyQ== dependencies: - "@budibase/types" "2.0.40-alpha.2" + "@budibase/types" "2.0.40-alpha.3" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.0.40-alpha.2": - version "2.0.40-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.2.tgz#f2c6b081d6a62611e469d70699ffab71c687abda" - integrity sha512-ZGN/Msv1HbczkwCGxak/XJAlgfEys8Yk+GOiD2rUstc7LHqi/2jJ0K43qVe2r3serSPFcNNAUphrR3BBZp5J4Q== +"@budibase/pro@2.0.40-alpha.3": + version "2.0.40-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.3.tgz#2803890c582dfca5852a7c17483d892f2404632f" + integrity sha512-N8oqjC2kZ1rzgjYPxiJriOTHu4KT+g6GSzvMSQ7SLIi0BBENO7QWhQOK1S01vJX3a8oe0oLY3JfkzxrvWvKtSQ== dependencies: - "@budibase/backend-core" "2.0.40-alpha.2" - "@budibase/types" "2.0.40-alpha.2" + "@budibase/backend-core" "2.0.40-alpha.3" + "@budibase/types" "2.0.40-alpha.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.40-alpha.2": - version "2.0.40-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.2.tgz#89e79547a376e59b56875edcbfded1425e3d85e8" - integrity sha512-ddjWF2OQJSevwNkaTDwxUaiSdImgjdZXRtjRmhsLazvc1EwKRrAejnoDa/vD9JKI1l/+si7gG4XyhHumAFkf9Q== +"@budibase/types@2.0.40-alpha.3": + version "2.0.40-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.3.tgz#2c1f9668f281a18e214626ccce2ce37fa7eb345a" + integrity sha512-bzmbOjVZZwPIBntM9j55EN4xhgeWVkw1zH3hRmgU3vB9t1tU1CDerWAXNktUgJdvI5YO/j7PPb0IsY/6WnYxcQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0"