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

Merge branch 'merge-master-develop' of github.com:Budibase/budibase into merge-master-develop

This commit is contained in:
mike12345567 2023-03-31 13:51:20 +01:00
parent 420190f577 4e384977b6
commit 906d614c64
22 changed files with 88 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/budibase_ci.yml vendored
View File

@ -56,7 +56,6 @@ jobs:
run: yarn install:pro $BRANCH $BASE_BRANCH
- run: yarn
- run: yarn bootstrap
- run: yarn build:client
- run: yarn test
- uses: codecov/codecov-action@v3
with:

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "2.4.42-alpha.8",
"version": "2.4.43",
"npmClient": "yarn",
"packages": [
"packages/*"

3
package.json
View File

@ -25,7 +25,6 @@
"setup": "node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev",
"bootstrap": "lerna bootstrap && lerna link && ./scripts/link-dependencies.sh",
"build": "lerna run build",
"build:client": "lerna run build --ignore @budibase/backend-core --ignore @budibase/worker --ignore @budibase/server --ignore @budibase/builder --ignore @budibase/cli --ignore @budibase/sdk",
"build:dev": "lerna run prebuild && tsc --build --watch --preserveWatchOutput",
"build:backend": "lerna run build --ignore @budibase/client --ignore @budibase/bbui --ignore @budibase/builder --ignore @budibase/cli",
"build:sdk": "lerna run build:sdk",
@ -45,7 +44,7 @@
"dev": "yarn run kill-all && lerna link && lerna run --parallel dev:builder --concurrency 1",
"dev:noserver": "yarn run kill-builder && lerna link && lerna run dev:stack:up && lerna run --parallel dev:builder --concurrency 1 --ignore @budibase/backend-core --ignore @budibase/server --ignore @budibase/worker",
"dev:server": "yarn run kill-server && lerna run --parallel dev:builder --concurrency 1 --scope @budibase/backend-core --scope @budibase/worker --scope @budibase/server",
"test": "lerna run test",
"test": "lerna run test --stream",
"test:pro": "bash scripts/pro/test.sh",
"lint:eslint": "eslint packages && eslint qa-core",
"lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\" && prettier --check \"qa-core/**/*.{js,ts,svelte}\"",

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "2.4.42-alpha.8",
"version": "2.4.43",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -24,7 +24,7 @@
"dependencies": {
"@budibase/nano": "10.1.2",
"@budibase/pouchdb-replication-stream": "1.2.10",
"@budibase/types": "2.4.42-alpha.8",
"@budibase/types": "^2.4.43",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-cloudfront-sign": "2.2.0",

7
packages/backend-core/scripts/test.sh
View File

@ -1,4 +1,5 @@
#!/bin/bash
set -e
if [[ -n $CI ]]
then
@ -7,6 +8,6 @@ then
jest --coverage --runInBand --forceExit
else
# --maxWorkers performs better in development
echo "jest --coverage"
jest --coverage
fi
echo "jest --coverage --forceExit"
jest --coverage --forceExit
fi

6
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "2.4.42-alpha.8",
"version": "2.4.43",
"license": "MPL-2.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",
@ -38,8 +38,8 @@
],
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "1.2.1",
"@budibase/shared-core": "2.4.42-alpha.8",
"@budibase/string-templates": "2.4.42-alpha.8",
"@budibase/shared-core": "^2.4.43",
"@budibase/string-templates": "^2.4.43",
"@spectrum-css/accordion": "3.0.24",
"@spectrum-css/actionbutton": "1.0.1",
"@spectrum-css/actiongroup": "1.0.1",

12
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "2.4.42-alpha.8",
"version": "2.4.43",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -58,11 +58,11 @@
}
},
"dependencies": {
"@budibase/bbui": "2.4.42-alpha.8",
"@budibase/client": "2.4.42-alpha.8",
"@budibase/frontend-core": "2.4.42-alpha.8",
"@budibase/shared-core": "2.4.42-alpha.8",
"@budibase/string-templates": "2.4.42-alpha.8",
"@budibase/bbui": "^2.4.43",
"@budibase/client": "^2.4.43",
"@budibase/frontend-core": "^2.4.43",
"@budibase/shared-core": "^2.4.43",
"@budibase/string-templates": "^2.4.43",
"@fortawesome/fontawesome-svg-core": "^6.2.1",
"@fortawesome/free-brands-svg-icons": "^6.2.1",
"@fortawesome/free-solid-svg-icons": "^6.2.1",

8
packages/cli/package.json
View File

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

12
packages/client/package.json
View File

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

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

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

2
packages/sdk/package.json
View File

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

1
packages/server/jest.config.ts
View File

@ -44,6 +44,7 @@ const config: Config.InitialOptions = {
// The use of coverage with couchdb view functions breaks tests
"!src/db/views/staticViews.*",
"!src/**/*.spec.{js,ts}",
"!src/tests/**/*.{js,ts}",
],
coverageReporters: ["lcov", "json", "clover"],
}

16
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "2.4.42-alpha.8",
"version": "2.4.43",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -14,7 +14,7 @@
"build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
"debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
"postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
"test": "NODE_OPTIONS=\"--max-old-space-size=4096\" bash scripts/test.sh",
"test": "bash scripts/test.sh",
"test:memory": "jest --maxWorkers=2 --logHeapUsage --forceExit",
"test:watch": "jest --watch",
"predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
@ -44,12 +44,12 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "2.4.42-alpha.8",
"@budibase/client": "2.4.42-alpha.8",
"@budibase/pro": "2.4.42-alpha.8",
"@budibase/shared-core": "2.4.42-alpha.8",
"@budibase/string-templates": "2.4.42-alpha.8",
"@budibase/types": "2.4.42-alpha.8",
"@budibase/backend-core": "^2.4.43",
"@budibase/client": "^2.4.43",
"@budibase/pro": "2.4.43",
"@budibase/shared-core": "^2.4.43",
"@budibase/string-templates": "^2.4.43",
"@budibase/types": "^2.4.43",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

8
packages/server/scripts/test.sh
View File

@ -1,12 +1,14 @@
#!/bin/bash
set -e
if [[ -n $CI ]]
then
# --runInBand performs better in ci where resources are limited
export NODE_OPTIONS="--max-old-space-size=4096"
echo "jest --coverage --runInBand --forceExit"
jest --coverage --runInBand --forceExit
else
# --maxWorkers performs better in development
echo "jest --coverage --maxWorkers=2"
jest --coverage --maxWorkers=2
fi
echo "jest --coverage --maxWorkers=2 --forceExit"
jest --coverage --maxWorkers=2 --forceExit
fi

4
packages/server/src/utilities/fileSystem/filesystem.ts
View File

@ -24,10 +24,6 @@ export const init = () => {
}
}
}
const clientLibPath = join(budibaseTempDir(), "budibase-client.js")
if (env.isTest() && !fs.existsSync(clientLibPath)) {
fs.copyFileSync(require.resolve("@budibase/client"), clientLibPath)
}
}
/**

30
packages/server/yarn.lock
View File

@ -1290,14 +1290,14 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.4.42-alpha.8":
version "2.4.42-alpha.8"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.8.tgz#4725f88985a99c11c43e2ef5a8d61419bb60cd60"
integrity sha512-G4ysFqSZKA/JT+jKs1a5C/3BttS7/Omk6HWGXvFdvtHNHrWbl+g3irKtvQjdT5QGks7veDuJoNRNbO2dSm3ArA==
"@budibase/backend-core@2.4.43":
version "2.4.43"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.43.tgz#801cdad706a90f6718e9323dd66e7e664cc9b287"
integrity sha512-pxMjFsCugkR/lR6XsA4bAbBEnUta92jjeUIY4C//hjczHF0lwEUWqhhR8QRCMaNTrWoJfZBFGnJyNIqfguyDVw==
dependencies:
"@budibase/nano" "10.1.2"
"@budibase/pouchdb-replication-stream" "1.2.10"
"@budibase/types" "2.4.42-alpha.8"
"@budibase/types" "^2.4.43"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0"
@ -1429,14 +1429,14 @@
pouchdb-promise "^6.0.4"
through2 "^2.0.0"
"@budibase/pro@2.4.42-alpha.8":
version "2.4.42-alpha.8"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.8.tgz#d248c8c26e5f6267c0f785271463e5ed6d828855"
integrity sha512-hUhHuwnq1if9H5xkmuXbsuT4RPz2Nh8LyAmcSnfBkEnvQosTuFSrvKNWO6ZAY4jOCrtjuE/6q1sSoGGDNlKqLA==
"@budibase/pro@2.4.43":
version "2.4.43"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.43.tgz#e717000a26fd4c183a984a141965945a26ac83d9"
integrity sha512-J/Up28bSV5E2UTQBpaTOXvNG1jQqRj8fcZH5TSqS7ymJ2H4OyLOQvEGFL3roCGnN3Dgrzkfv9LBO0JyRORVtSw==
dependencies:
"@budibase/backend-core" "2.4.42-alpha.8"
"@budibase/backend-core" "2.4.43"
"@budibase/string-templates" "2.3.20"
"@budibase/types" "2.4.42-alpha.8"
"@budibase/types" "2.4.43"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
@ -1475,10 +1475,10 @@
lodash "^4.17.20"
vm2 "^3.9.4"
"@budibase/types@2.4.42-alpha.8":
version "2.4.42-alpha.8"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.8.tgz#0973c9147eeb1aabfbeaa22a288ca5270b35343f"
integrity sha512-UyBmgI3WNaTNpEz8R1M95OAKXvGMQYZqfW78f2vWAMe12esfxjK7otv+vrxhmf9we3d59Yxf7HwLV0Q42Rp7TA==
"@budibase/types@2.4.43", "@budibase/types@^2.4.43":
version "2.4.43"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.43.tgz#2f6e609bada8855c83dfb26deb3b2d64dbb2d401"
integrity sha512-OWr8dNjk3VjjAJ4Rni/+AMGDtCDhz7LrZqxgedL0wKiRwgwkSiBNExh1eIZ/NKlt1vZrzH/GG5jhzlPkYqDTQg==
"@bull-board/api@3.7.0":
version "3.7.0"

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

@ -1,6 +1,6 @@
{
"name": "@budibase/shared-core",
"version": "2.4.42-alpha.8",
"version": "2.4.43",
"description": "Shared data utils",
"main": "dist/cjs/src/index.js",
"types": "dist/mjs/src/index.d.ts",
@ -20,7 +20,7 @@
"dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
},
"dependencies": {
"@budibase/types": "2.4.42-alpha.8"
"@budibase/types": "^2.4.43"
},
"devDependencies": {
"concurrently": "^7.6.0",

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

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

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "2.4.42-alpha.8",
"version": "2.4.43",
"description": "Budibase types",
"main": "dist/cjs/index.js",
"types": "dist/mjs/index.d.ts",

10
packages/worker/package.json
View File

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

7
packages/worker/scripts/test.sh
View File

@ -1,4 +1,5 @@
#!/bin/bash
set -e
if [[ -n $CI ]]
then
@ -7,6 +8,6 @@ then
jest --coverage --runInBand --forceExit
else
# --maxWorkers performs better in development
echo "jest --coverage --maxWorkers=2"
jest --coverage --maxWorkers=2
fi
echo "jest --coverage --maxWorkers=2 --forceExit"
jest --coverage --maxWorkers=2 --forceExit
fi

30
packages/worker/yarn.lock
View File

@ -475,14 +475,14 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.4.42-alpha.8":
version "2.4.42-alpha.8"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.8.tgz#4725f88985a99c11c43e2ef5a8d61419bb60cd60"
integrity sha512-G4ysFqSZKA/JT+jKs1a5C/3BttS7/Omk6HWGXvFdvtHNHrWbl+g3irKtvQjdT5QGks7veDuJoNRNbO2dSm3ArA==
"@budibase/backend-core@2.4.43":
version "2.4.43"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.43.tgz#801cdad706a90f6718e9323dd66e7e664cc9b287"
integrity sha512-pxMjFsCugkR/lR6XsA4bAbBEnUta92jjeUIY4C//hjczHF0lwEUWqhhR8QRCMaNTrWoJfZBFGnJyNIqfguyDVw==
dependencies:
"@budibase/nano" "10.1.2"
"@budibase/pouchdb-replication-stream" "1.2.10"
"@budibase/types" "2.4.42-alpha.8"
"@budibase/types" "^2.4.43"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0"
@ -564,14 +564,14 @@
pouchdb-promise "^6.0.4"
through2 "^2.0.0"
"@budibase/pro@2.4.42-alpha.8":
version "2.4.42-alpha.8"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.8.tgz#d248c8c26e5f6267c0f785271463e5ed6d828855"
integrity sha512-hUhHuwnq1if9H5xkmuXbsuT4RPz2Nh8LyAmcSnfBkEnvQosTuFSrvKNWO6ZAY4jOCrtjuE/6q1sSoGGDNlKqLA==
"@budibase/pro@2.4.43":
version "2.4.43"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.43.tgz#e717000a26fd4c183a984a141965945a26ac83d9"
integrity sha512-J/Up28bSV5E2UTQBpaTOXvNG1jQqRj8fcZH5TSqS7ymJ2H4OyLOQvEGFL3roCGnN3Dgrzkfv9LBO0JyRORVtSw==
dependencies:
"@budibase/backend-core" "2.4.42-alpha.8"
"@budibase/backend-core" "2.4.43"
"@budibase/string-templates" "2.3.20"
"@budibase/types" "2.4.42-alpha.8"
"@budibase/types" "2.4.43"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
@ -592,10 +592,10 @@
lodash "^4.17.20"
vm2 "^3.9.4"
"@budibase/types@2.4.42-alpha.8":
version "2.4.42-alpha.8"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.8.tgz#0973c9147eeb1aabfbeaa22a288ca5270b35343f"
integrity sha512-UyBmgI3WNaTNpEz8R1M95OAKXvGMQYZqfW78f2vWAMe12esfxjK7otv+vrxhmf9we3d59Yxf7HwLV0Q42Rp7TA==
"@budibase/types@2.4.43", "@budibase/types@^2.4.43":
version "2.4.43"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.43.tgz#2f6e609bada8855c83dfb26deb3b2d64dbb2d401"
integrity sha512-OWr8dNjk3VjjAJ4Rni/+AMGDtCDhz7LrZqxgedL0wKiRwgwkSiBNExh1eIZ/NKlt1vZrzH/GG5jhzlPkYqDTQg==
"@cspotcode/source-map-support@^0.8.0":
version "0.8.1"