MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into fix/looping-issue

This commit is contained in:
Peter Clement 2023-01-05 15:20:05 +00:00
parent 57a5d8505d 0bd551505c
commit 68959ac25a
15 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.2.10-alpha.12", "version": "2.2.10-alpha.14",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/backend-core", "name": "@budibase/backend-core",
"version": "2.2.10-alpha.12", "version": "2.2.10-alpha.14",
"description": "Budibase backend core libraries used in server and worker", "description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js", "main": "dist/src/index.js",
"types": "dist/src/index.d.ts", "types": "dist/src/index.d.ts",
@ -23,7 +23,7 @@
}, },
"dependencies": { "dependencies": {
"@budibase/nano": "10.1.1", "@budibase/nano": "10.1.1",
"@budibase/types": "2.2.10-alpha.12", "@budibase/types": "2.2.10-alpha.14",
"@shopify/jest-koa-mocks": "5.0.1", "@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",
"aws-cloudfront-sign": "2.2.0", "aws-cloudfront-sign": "2.2.0",

6
packages/backend-core/src/objectStore/objectStore.ts
View File

@ -329,9 +329,9 @@ export const deleteFile = async (bucketName: string, filepath: string) => {
await makeSureBucketExists(objectStore, bucketName) await makeSureBucketExists(objectStore, bucketName)
const params = { const params = {
Bucket: bucketName, Bucket: bucketName,
Key: filepath, Key: sanitizeKey(filepath),
} }
return objectStore.deleteObject(params) return objectStore.deleteObject(params).promise()
} }
export const deleteFiles = async (bucketName: string, filepaths: string[]) => { export const deleteFiles = async (bucketName: string, filepaths: string[]) => {
@ -340,7 +340,7 @@ export const deleteFiles = async (bucketName: string, filepaths: string[]) => {
const params = { const params = {
Bucket: bucketName, Bucket: bucketName,
Delete: { Delete: {
Objects: filepaths.map((path: any) => ({ Key: path })), Objects: filepaths.map((path: any) => ({ Key: sanitizeKey(path) })),
}, },
} }
return objectStore.deleteObjects(params).promise() return objectStore.deleteObjects(params).promise()

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/bbui", "name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.", "description": "A UI solution used in the different Budibase projects.",
"version": "2.2.10-alpha.12", "version": "2.2.10-alpha.14",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"module": "dist/bbui.es.js", "module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
], ],
"dependencies": { "dependencies": {
"@adobe/spectrum-css-workflow-icons": "1.2.1", "@adobe/spectrum-css-workflow-icons": "1.2.1",
"@budibase/string-templates": "2.2.10-alpha.12", "@budibase/string-templates": "2.2.10-alpha.14",
"@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actionbutton": "1.0.1",
"@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/actiongroup": "1.0.1",
"@spectrum-css/avatar": "3.0.2", "@spectrum-css/avatar": "3.0.2",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "2.2.10-alpha.12", "version": "2.2.10-alpha.14",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -71,10 +71,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "2.2.10-alpha.12", "@budibase/bbui": "2.2.10-alpha.14",
"@budibase/client": "2.2.10-alpha.12", "@budibase/client": "2.2.10-alpha.14",
"@budibase/frontend-core": "2.2.10-alpha.12", "@budibase/frontend-core": "2.2.10-alpha.14",
"@budibase/string-templates": "2.2.10-alpha.12", "@budibase/string-templates": "2.2.10-alpha.14",
"@sentry/browser": "5.19.1", "@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1", "@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1", "@spectrum-css/vars": "^3.0.1",

8
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "2.2.10-alpha.12", "version": "2.2.10-alpha.14",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js", "main": "src/index.js",
"bin": { "bin": {
@ -26,9 +26,9 @@
"outputPath": "build" "outputPath": "build"
}, },
"dependencies": { "dependencies": {
"@budibase/backend-core": "2.2.10-alpha.12", "@budibase/backend-core": "2.2.10-alpha.14",
"@budibase/string-templates": "2.2.10-alpha.12", "@budibase/string-templates": "2.2.10-alpha.14",
"@budibase/types": "2.2.10-alpha.12", "@budibase/types": "2.2.10-alpha.14",
"axios": "0.21.2", "axios": "0.21.2",
"chalk": "4.1.0", "chalk": "4.1.0",
"cli-progress": "3.11.2", "cli-progress": "3.11.2",

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "2.2.10-alpha.12", "version": "2.2.10-alpha.14",
"license": "MPL-2.0", "license": "MPL-2.0",
"module": "dist/budibase-client.js", "module": "dist/budibase-client.js",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "2.2.10-alpha.12", "@budibase/bbui": "2.2.10-alpha.14",
"@budibase/frontend-core": "2.2.10-alpha.12", "@budibase/frontend-core": "2.2.10-alpha.14",
"@budibase/string-templates": "2.2.10-alpha.12", "@budibase/string-templates": "2.2.10-alpha.14",
"@spectrum-css/button": "^3.0.3", "@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3", "@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3", "@spectrum-css/divider": "^1.0.3",

4
packages/frontend-core/package.json
View File

@ -1,12 +1,12 @@
{ {
"name": "@budibase/frontend-core", "name": "@budibase/frontend-core",
"version": "2.2.10-alpha.12", "version": "2.2.10-alpha.14",
"description": "Budibase frontend core libraries used in builder and client", "description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"dependencies": { "dependencies": {
"@budibase/bbui": "2.2.10-alpha.12", "@budibase/bbui": "2.2.10-alpha.14",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"svelte": "^3.46.2" "svelte": "^3.46.2"
} }

2
packages/sdk/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/sdk", "name": "@budibase/sdk",
"version": "2.2.10-alpha.12", "version": "2.2.10-alpha.14",
"description": "Budibase Public API SDK", "description": "Budibase Public API SDK",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/server", "name": "@budibase/server",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "2.2.10-alpha.12", "version": "2.2.10-alpha.14",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -43,11 +43,11 @@
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@apidevtools/swagger-parser": "10.0.3", "@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "2.2.10-alpha.12", "@budibase/backend-core": "2.2.10-alpha.14",
"@budibase/client": "2.2.10-alpha.12", "@budibase/client": "2.2.10-alpha.14",
"@budibase/pro": "2.2.10-alpha.12", "@budibase/pro": "2.2.10-alpha.13",
"@budibase/string-templates": "2.2.10-alpha.12", "@budibase/string-templates": "2.2.10-alpha.14",
"@budibase/types": "2.2.10-alpha.12", "@budibase/types": "2.2.10-alpha.14",
"@bull-board/api": "3.7.0", "@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4", "@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0", "@elastic/elasticsearch": "7.10.0",

30
packages/server/yarn.lock
View File

@ -1273,13 +1273,13 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.2.10-alpha.12": "@budibase/backend-core@2.2.10-alpha.13":
version "2.2.10-alpha.12" version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.12.tgz#57fbd4633b8475745f9d0bb968d24b173759aea3" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.13.tgz#05452df1333c7101d6ef36d986e5fb643b6f8a8d"
integrity sha512-gmx4DFO9s2yVlJPkWxOmicDDhIJhKjPM9+OhW1B8uBRCWhR4LMOFeM72fbSykgkzqlTFYinab8M6yiU40ko5Kg== integrity sha512-RFK5z9nqMoox2w5sXEjUBY5pdcmXHa+1PVDXTachxUg7wLQ2/qPDbx9FxTL1/ICpMbvfO2Bzy5ZHcjboVl7GIA==
dependencies: dependencies:
"@budibase/nano" "10.1.1" "@budibase/nano" "10.1.1"
"@budibase/types" "2.2.10-alpha.12" "@budibase/types" "2.2.10-alpha.13"
"@shopify/jest-koa-mocks" "5.0.1" "@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2" "@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0" aws-cloudfront-sign "2.2.0"
@ -1373,13 +1373,13 @@
qs "^6.11.0" qs "^6.11.0"
tough-cookie "^4.1.2" tough-cookie "^4.1.2"
"@budibase/pro@2.2.10-alpha.12": "@budibase/pro@2.2.10-alpha.13":
version "2.2.10-alpha.12" version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.12.tgz#ab356f6964faaff72289c170ee85468411c92c64" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.13.tgz#b1ef3364ad9b379785123065bad67c18cfd28924"
integrity sha512-jSOlgbGEg1l1e0x/4Q7TqZSm1O58IDnupHJHiH9/zIORmxFNrC3jFczJT5NjbiZp4LEViObudzQyRCe9+6OYoQ== integrity sha512-bdYz5S5lS1x/68csWKioMAHf8WYpYdtkri+xN3TplXj2txSAVEkt4e6KGJ2VoA9cK/bA9HtDFtbs0VyHUoXHkA==
dependencies: dependencies:
"@budibase/backend-core" "2.2.10-alpha.12" "@budibase/backend-core" "2.2.10-alpha.13"
"@budibase/types" "2.2.10-alpha.12" "@budibase/types" "2.2.10-alpha.13"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
bull "4.10.1" bull "4.10.1"
joi "17.6.0" joi "17.6.0"
@ -1404,10 +1404,10 @@
svelte-apexcharts "^1.0.2" svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0" svelte-flatpickr "^3.1.0"
"@budibase/types@2.2.10-alpha.12": "@budibase/types@2.2.10-alpha.13":
version "2.2.10-alpha.12" version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.12.tgz#c400c8f5601314b2906029643b613870385b8608" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.13.tgz#abc1a5bd9295a0fa63db67912c6520d12e8d6f66"
integrity sha512-Yb9vjr+WSRXZ90qAj7vXR4XzIpjOjgB/9GDWTR9XDn1Ul996RSar0J2e6Yla1D7As4ok7bV3aumT7At+Wk+4pw== integrity sha512-XRmLQXCLKdOADxEoGB3h4QOrHlPIqbk9jOSxyOK2RDQIy8NdQ+aXanPw3TEHkgrDIYxrClVcf4KXrujqNnrk6g==
"@bull-board/api@3.7.0": "@bull-board/api@3.7.0":
version "3.7.0" version "3.7.0"

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/string-templates", "name": "@budibase/string-templates",
"version": "2.2.10-alpha.12", "version": "2.2.10-alpha.14",
"description": "Handlebars wrapper for Budibase templating.", "description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs", "main": "src/index.cjs",
"module": "dist/bundle.mjs", "module": "dist/bundle.mjs",

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/types", "name": "@budibase/types",
"version": "2.2.10-alpha.12", "version": "2.2.10-alpha.14",
"description": "Budibase types", "description": "Budibase types",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/worker", "name": "@budibase/worker",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "2.2.10-alpha.12", "version": "2.2.10-alpha.14",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -36,10 +36,10 @@
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@budibase/backend-core": "2.2.10-alpha.12", "@budibase/backend-core": "2.2.10-alpha.14",
"@budibase/pro": "2.2.10-alpha.12", "@budibase/pro": "2.2.10-alpha.13",
"@budibase/string-templates": "2.2.10-alpha.12", "@budibase/string-templates": "2.2.10-alpha.14",
"@budibase/types": "2.2.10-alpha.12", "@budibase/types": "2.2.10-alpha.14",
"@koa/router": "8.0.8", "@koa/router": "8.0.8",
"@sentry/node": "6.17.7", "@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",

30
packages/worker/yarn.lock
View File

@ -470,13 +470,13 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.2.10-alpha.12": "@budibase/backend-core@2.2.10-alpha.13":
version "2.2.10-alpha.12" version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.12.tgz#57fbd4633b8475745f9d0bb968d24b173759aea3" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.13.tgz#05452df1333c7101d6ef36d986e5fb643b6f8a8d"
integrity sha512-gmx4DFO9s2yVlJPkWxOmicDDhIJhKjPM9+OhW1B8uBRCWhR4LMOFeM72fbSykgkzqlTFYinab8M6yiU40ko5Kg== integrity sha512-RFK5z9nqMoox2w5sXEjUBY5pdcmXHa+1PVDXTachxUg7wLQ2/qPDbx9FxTL1/ICpMbvfO2Bzy5ZHcjboVl7GIA==
dependencies: dependencies:
"@budibase/nano" "10.1.1" "@budibase/nano" "10.1.1"
"@budibase/types" "2.2.10-alpha.12" "@budibase/types" "2.2.10-alpha.13"
"@shopify/jest-koa-mocks" "5.0.1" "@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2" "@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0" aws-cloudfront-sign "2.2.0"
@ -520,23 +520,23 @@
qs "^6.11.0" qs "^6.11.0"
tough-cookie "^4.1.2" tough-cookie "^4.1.2"
"@budibase/pro@2.2.10-alpha.12": "@budibase/pro@2.2.10-alpha.13":
version "2.2.10-alpha.12" version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.12.tgz#ab356f6964faaff72289c170ee85468411c92c64" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.13.tgz#b1ef3364ad9b379785123065bad67c18cfd28924"
integrity sha512-jSOlgbGEg1l1e0x/4Q7TqZSm1O58IDnupHJHiH9/zIORmxFNrC3jFczJT5NjbiZp4LEViObudzQyRCe9+6OYoQ== integrity sha512-bdYz5S5lS1x/68csWKioMAHf8WYpYdtkri+xN3TplXj2txSAVEkt4e6KGJ2VoA9cK/bA9HtDFtbs0VyHUoXHkA==
dependencies: dependencies:
"@budibase/backend-core" "2.2.10-alpha.12" "@budibase/backend-core" "2.2.10-alpha.13"
"@budibase/types" "2.2.10-alpha.12" "@budibase/types" "2.2.10-alpha.13"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
bull "4.10.1" bull "4.10.1"
joi "17.6.0" joi "17.6.0"
jsonwebtoken "8.5.1" jsonwebtoken "8.5.1"
node-fetch "^2.6.1" node-fetch "^2.6.1"
"@budibase/types@2.2.10-alpha.12": "@budibase/types@2.2.10-alpha.13":
version "2.2.10-alpha.12" version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.12.tgz#c400c8f5601314b2906029643b613870385b8608" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.13.tgz#abc1a5bd9295a0fa63db67912c6520d12e8d6f66"
integrity sha512-Yb9vjr+WSRXZ90qAj7vXR4XzIpjOjgB/9GDWTR9XDn1Ul996RSar0J2e6Yla1D7As4ok7bV3aumT7At+Wk+4pw== integrity sha512-XRmLQXCLKdOADxEoGB3h4QOrHlPIqbk9jOSxyOK2RDQIy8NdQ+aXanPw3TEHkgrDIYxrClVcf4KXrujqNnrk6g==
"@cspotcode/source-map-support@^0.8.0": "@cspotcode/source-map-support@^0.8.0":
version "0.8.1" version "0.8.1"