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/master' into fix/multipicker-default-behaviour

This commit is contained in:
Dean 2022-10-21 15:36:16 +01:00
parent 0e4a7ace08 721c75d39e
commit 59105b4b8a
17 changed files with 71 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
hosting/proxy/10-listen-on-ipv6-by-default.sh → hosting/proxy/80-listen-on-ipv6-by-default.sh
View File

6
hosting/proxy/Dockerfile
View File

@ -5,8 +5,10 @@ FROM nginx:latest
# override the output dir to output directly to /etc/nginx instead of /etc/nginx/conf.d # override the output dir to output directly to /etc/nginx instead of /etc/nginx/conf.d
ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
COPY .generated-nginx.prod.conf /etc/nginx/templates/nginx.conf.template COPY .generated-nginx.prod.conf /etc/nginx/templates/nginx.conf.template
COPY 10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh # IPv6 removal needs to happen after envsubst
RUN chmod +x /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh RUN rm -rf /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
COPY 80-listen-on-ipv6-by-default.sh /docker-entrypoint.d/80-listen-on-ipv6-by-default.sh
RUN chmod +x /docker-entrypoint.d/80-listen-on-ipv6-by-default.sh
# Error handling # Error handling
COPY error.html /usr/share/nginx/html/error.html COPY error.html /usr/share/nginx/html/error.html

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.0.32", "version": "2.0.34",
"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.0.32", "version": "2.0.34",
"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",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll" "test:watch": "jest --watchAll"
}, },
"dependencies": { "dependencies": {
"@budibase/types": "^2.0.32", "@budibase/types": "^2.0.34",
"@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-sdk": "2.1030.0", "aws-sdk": "2.1030.0",

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.0.32", "version": "2.0.34",
"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.0.32", "@budibase/string-templates": "^2.0.34",
"@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.0.32", "version": "2.0.34",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -71,10 +71,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^2.0.32", "@budibase/bbui": "^2.0.34",
"@budibase/client": "^2.0.32", "@budibase/client": "^2.0.34",
"@budibase/frontend-core": "^2.0.32", "@budibase/frontend-core": "^2.0.34",
"@budibase/string-templates": "^2.0.32", "@budibase/string-templates": "^2.0.34",
"@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.0.32", "version": "2.0.34",
"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.0.32", "@budibase/backend-core": "^2.0.34",
"@budibase/string-templates": "^2.0.32", "@budibase/string-templates": "^2.0.34",
"@budibase/types": "^2.0.32", "@budibase/types": "^2.0.34",
"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.0.32", "version": "2.0.34",
"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.0.32", "@budibase/bbui": "^2.0.34",
"@budibase/frontend-core": "^2.0.32", "@budibase/frontend-core": "^2.0.34",
"@budibase/string-templates": "^2.0.32", "@budibase/string-templates": "^2.0.34",
"@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.0.32", "version": "2.0.34",
"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.0.32", "@budibase/bbui": "^2.0.34",
"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.0.32", "version": "2.0.34",
"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.0.32", "version": "2.0.34",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -77,11 +77,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.0.32", "@budibase/backend-core": "^2.0.34",
"@budibase/client": "^2.0.32", "@budibase/client": "^2.0.34",
"@budibase/pro": "2.0.32", "@budibase/pro": "2.0.34",
"@budibase/string-templates": "^2.0.32", "@budibase/string-templates": "^2.0.34",
"@budibase/types": "^2.0.32", "@budibase/types": "^2.0.34",
"@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

@ -1094,12 +1094,12 @@
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.0.32": "@budibase/backend-core@2.0.34":
version "2.0.32" version "2.0.34"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.32.tgz#638c89302cc834d7cc11c5ce97bb3305392b9c85" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34.tgz#67d140a55a3a1bc807bb60bf06062e1361588977"
integrity sha512-4Pmh1VFmXlwnh5B5Jq75h+i5hVvOEQmDRVRvbsNk5sYAk/xxVbf7/kIQJ0OuhuTA+WfY8EpQLDEnHGhdTeFhWA== integrity sha512-ofJZNOTA8oO5FxhwBPEuZ6Rq7lO47QkHVreEvESgAb4aJLpCoLNmWhizKN2iRgZ0+avgoauAd36Yj+qI1mVjkQ==
dependencies: dependencies:
"@budibase/types" "^2.0.32" "@budibase/types" "^2.0.34"
"@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-sdk "2.1030.0" aws-sdk "2.1030.0"
@ -1180,13 +1180,13 @@
svelte-flatpickr "^3.2.3" svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0" svelte-portal "^1.0.0"
"@budibase/pro@2.0.32": "@budibase/pro@2.0.34":
version "2.0.32" version "2.0.34"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.32.tgz#b091d5fda894cdce179f97441b9ed69ba7859f84" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34.tgz#8b8e51bd847eb415f259d71b26c6f89ed2166a49"
integrity sha512-5LNXUGu+J6pH8iNfkv2jWxyBJhek0M3KtAJvTspREeK5BZ+dxHR2AxceIksKVFy3Tco7mGs2haSRQ0qActIgCg== integrity sha512-lJQAOw9SBDkLwLsglriGNIuOHMPNrKzLCRCCpETGNuhnRi/kvILck1lk3oyhz3dxllyBb8iDOMleEUBxSAum1Q==
dependencies: dependencies:
"@budibase/backend-core" "2.0.32" "@budibase/backend-core" "2.0.34"
"@budibase/types" "2.0.32" "@budibase/types" "2.0.34"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
joi "17.6.0" joi "17.6.0"
node-fetch "^2.6.1" node-fetch "^2.6.1"
@ -1209,10 +1209,10 @@
svelte-apexcharts "^1.0.2" svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0" svelte-flatpickr "^3.1.0"
"@budibase/types@2.0.32", "@budibase/types@^2.0.32": "@budibase/types@2.0.34", "@budibase/types@^2.0.34":
version "2.0.32" version "2.0.34"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.32.tgz#dda8989d7e59cdae8088447c568cabd7ea99dee5" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34.tgz#1a7c483a1577596cc896d5d03f04ebafe037b664"
integrity sha512-ALTVPOdRlGFzI8AvYJcBncQiLxqM3coZV0Jc5fCJbSNZ9pObHxibhkCunGSevdEOC1l5p/vT7/B5bUD4fUvnsg== integrity sha512-pt8/gCRuErKfSv3sVu75bHSjgpPv/bAaMb+Vam1xyp0gY7YUR1yBhllWY0tEIVXroCe0kgn40+fKZOR2Yli0ag==
"@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.0.32", "version": "2.0.34",
"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",

3
packages/string-templates/src/index.js
View File

@ -323,6 +323,9 @@ module.exports.doesContainStrings = (template, strings) => {
* @return {string[]} The found HBS blocks. * @return {string[]} The found HBS blocks.
*/ */
module.exports.findHBSBlocks = string => { module.exports.findHBSBlocks = string => {
if (!string || typeof string !== "string") {
return []
}
let regexp = new RegExp(FIND_ANY_HBS_REGEX) let regexp = new RegExp(FIND_ANY_HBS_REGEX)
let matches = string.match(regexp) let matches = string.match(regexp)
if (matches == null) { if (matches == null) {

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/types", "name": "@budibase/types",
"version": "2.0.32", "version": "2.0.34",
"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.0.32", "version": "2.0.34",
"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.0.32", "@budibase/backend-core": "^2.0.34",
"@budibase/pro": "2.0.32", "@budibase/pro": "2.0.34",
"@budibase/string-templates": "^2.0.32", "@budibase/string-templates": "^2.0.34",
"@budibase/types": "^2.0.32", "@budibase/types": "^2.0.34",
"@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

@ -291,12 +291,12 @@
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.0.32": "@budibase/backend-core@2.0.34":
version "2.0.32" version "2.0.34"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.32.tgz#638c89302cc834d7cc11c5ce97bb3305392b9c85" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34.tgz#67d140a55a3a1bc807bb60bf06062e1361588977"
integrity sha512-4Pmh1VFmXlwnh5B5Jq75h+i5hVvOEQmDRVRvbsNk5sYAk/xxVbf7/kIQJ0OuhuTA+WfY8EpQLDEnHGhdTeFhWA== integrity sha512-ofJZNOTA8oO5FxhwBPEuZ6Rq7lO47QkHVreEvESgAb4aJLpCoLNmWhizKN2iRgZ0+avgoauAd36Yj+qI1mVjkQ==
dependencies: dependencies:
"@budibase/types" "^2.0.32" "@budibase/types" "^2.0.34"
"@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-sdk "2.1030.0" aws-sdk "2.1030.0"
@ -327,21 +327,21 @@
uuid "8.3.2" uuid "8.3.2"
zlib "1.0.5" zlib "1.0.5"
"@budibase/pro@2.0.32": "@budibase/pro@2.0.34":
version "2.0.32" version "2.0.34"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.32.tgz#b091d5fda894cdce179f97441b9ed69ba7859f84" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34.tgz#8b8e51bd847eb415f259d71b26c6f89ed2166a49"
integrity sha512-5LNXUGu+J6pH8iNfkv2jWxyBJhek0M3KtAJvTspREeK5BZ+dxHR2AxceIksKVFy3Tco7mGs2haSRQ0qActIgCg== integrity sha512-lJQAOw9SBDkLwLsglriGNIuOHMPNrKzLCRCCpETGNuhnRi/kvILck1lk3oyhz3dxllyBb8iDOMleEUBxSAum1Q==
dependencies: dependencies:
"@budibase/backend-core" "2.0.32" "@budibase/backend-core" "2.0.34"
"@budibase/types" "2.0.32" "@budibase/types" "2.0.34"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
joi "17.6.0" joi "17.6.0"
node-fetch "^2.6.1" node-fetch "^2.6.1"
"@budibase/types@2.0.32", "@budibase/types@^2.0.32": "@budibase/types@2.0.34", "@budibase/types@^2.0.34":
version "2.0.32" version "2.0.34"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.32.tgz#dda8989d7e59cdae8088447c568cabd7ea99dee5" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34.tgz#1a7c483a1577596cc896d5d03f04ebafe037b664"
integrity sha512-ALTVPOdRlGFzI8AvYJcBncQiLxqM3coZV0Jc5fCJbSNZ9pObHxibhkCunGSevdEOC1l5p/vT7/B5bUD4fUvnsg== integrity sha512-pt8/gCRuErKfSv3sVu75bHSjgpPv/bAaMb+Vam1xyp0gY7YUR1yBhllWY0tEIVXroCe0kgn40+fKZOR2Yli0ag==
"@cspotcode/source-map-consumer@0.8.0": "@cspotcode/source-map-consumer@0.8.0":
version "0.8.0" version "0.8.0"