CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-09-28 23:31:43 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:Budibase/budibase into fix/sept-various-fixes

Browse source
This commit is contained in:
mike12345567 2022-09-07 13:42:30 +01:00
commit 5bec5dff55
21 changed files with 72 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hosting/nginx.dev.conf.hbs
View file

@ -65,10 +65,6 @@ http {
proxy_pass http://{{ address }}:4001;
}
location /preview {
proxy_pass http://{{ address }}:4001;
}
location /builder {
proxy_pass http://{{ address }}:3000;
rewrite ^/builder(.*)$ /builder/$1 break;

4
hosting/nginx.prod.conf.hbs
View file

@ -88,10 +88,6 @@ http {
proxy_pass http://$apps:4002;
}
location /preview {
proxy_pass http://$apps:4002;
}
location = / {
proxy_pass http://$apps:4002;
}

7
hosting/scripts/build-target-paths.sh
View file

@ -4,9 +4,9 @@ echo ${TARGETBUILD} > /buildtarget.txt
if [[ "${TARGETBUILD}" = "aas" ]]; then
# Azure AppService uses /home for persisent data & SSH on port 2222
DATA_DIR=/home
mkdir -p $DATA_DIR/{search,minio,couchdb}
mkdir -p $DATA_DIR/couchdb/{dbs,views}
chown -R couchdb:couchdb $DATA_DIR/couchdb/
mkdir -p $DATA_DIR/{search,minio,couch}
mkdir -p $DATA_DIR/couch/{dbs,views}
chown -R couchdb:couchdb $DATA_DIR/couch/
apt update
apt-get install -y openssh-server
sed -i "s/#Port 22/Port 2222/" /etc/ssh/sshd_config
@ -16,5 +16,4 @@ if [[ "${TARGETBUILD}" = "aas" ]]; then
else
sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini
sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini
fi

4
hosting/single/couch/local.ini
View file

@ -1,5 +1,5 @@
; CouchDB Configuration Settings
[couchdb]
database_dir = DATA_DIR/couchdb/dbs
view_index_dir = DATA_DIR/couchdb/views
database_dir = DATA_DIR/couch/dbs
view_index_dir = DATA_DIR/couch/views

4
hosting/single/runner.sh
View file

@ -36,10 +36,10 @@ fi
export COUCH_DB_URL=http://$COUCHDB_USER:$COUCHDB_PASSWORD@localhost:5984
# make these directories in runner, incase of mount
mkdir -p ${DATA_DIR}/couchdb/{dbs,views}
mkdir -p ${DATA_DIR}/couch/{dbs,views}
mkdir -p ${DATA_DIR}/minio
mkdir -p ${DATA_DIR}/search
chown -R couchdb:couchdb ${DATA_DIR}/couchdb
chown -R couchdb:couchdb ${DATA_DIR}/couch
redis-server --requirepass $REDIS_PASSWORD &
/opt/clouseau/bin/clouseau &
/minio/minio server ${DATA_DIR}/minio &

2
lerna.json
View file

@ -1,5 +1,5 @@
{
"version": "1.3.11",
"version": "1.3.12",
"npmClient": "yarn",
"packages": [
"packages/*"

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.3.11",
"version": "1.3.12",
"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": "^1.3.11",
"@budibase/types": "^1.3.12",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",

4
packages/bbui/package.json
View file

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "1.3.11",
"version": "1.3.12",
"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": "^1.3.11",
"@budibase/string-templates": "^1.3.12",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

10
packages/builder/package.json
View file

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

2
packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
View file

@ -290,7 +290,7 @@
<iframe
title="componentPreview"
bind:this={iframe}
src="/preview"
src="/app/preview"
class:hidden={loading || error}
class:tablet={$store.previewDevice === "tablet"}
class:mobile={$store.previewDevice === "mobile"}

4
packages/cli/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.3.11",
"version": "1.3.12",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {
@ -26,7 +26,7 @@
"outputPath": "build"
},
"dependencies": {
"@budibase/backend-core": "^1.3.11",
"@budibase/backend-core": "^1.3.12",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

8
packages/client/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.3.11",
"version": "1.3.12",
"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": "^1.3.11",
"@budibase/frontend-core": "^1.3.11",
"@budibase/string-templates": "^1.3.11",
"@budibase/bbui": "^1.3.12",
"@budibase/frontend-core": "^1.3.12",
"@budibase/string-templates": "^1.3.12",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

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

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

12
packages/server/package.json
View file

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.3.11",
"version": "1.3.12",
"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": "^1.3.11",
"@budibase/client": "^1.3.11",
"@budibase/pro": "1.3.11",
"@budibase/string-templates": "^1.3.11",
"@budibase/types": "^1.3.11",
"@budibase/backend-core": "^1.3.12",
"@budibase/client": "^1.3.12",
"@budibase/pro": "1.3.12",
"@budibase/string-templates": "^1.3.12",
"@budibase/types": "^1.3.12",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

2
packages/server/src/api/routes/static.ts
View file

@ -56,7 +56,7 @@ router
authorized(PermissionTypes.TABLE, PermissionLevels.WRITE),
controller.deleteObjects
)
.get("/preview", authorized(BUILDER), controller.serveBuilderPreview)
.get("/app/preview", authorized(BUILDER), controller.serveBuilderPreview)
.get("/:appId/:path*", controller.serveApp)
.get("/app/:appUrl/:path*", controller.serveApp)
.post(

4
packages/server/src/api/routes/tests/static.spec.js
View file

@ -150,14 +150,14 @@ describe("/static", () => {
})
})
describe("/preview", () => {
describe("/app/preview", () => {
beforeEach(() => {
jest.clearAllMocks()
})
it("should serve the builder preview", async () => {
const headers = config.defaultHeaders()
const res = await request.get(`/preview`).set(headers).expect(200)
const res = await request.get(`/app/preview`).set(headers).expect(200)
expect(res.body.appId).toBe(config.appId)
expect(res.body.builderPreview).toBe(true)

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"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.3.11":
version "1.3.11"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.11.tgz#ecd2125a97d7edd8c290caea659af01b08d456f7"
integrity sha512-JwZlHml5E4BCSRc94dUvM88ZWb6ZKogdaws366XQy0aa70z7M191LpsPP3x3mKZDg4H2hNNv2k4mQZBQBv0l8A==
"@budibase/backend-core@1.3.12":
version "1.3.12"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.12.tgz#dd5fbfe791b46343e783b9b23ff6f6e22d77ce1c"
integrity sha512-+fRBrf66peeNXzY5WA3y7Dz6Gl6EUYQI0/zswCddtZhs5+x1cFJZLLRu2V1MFJ41z+cNiw0Pru1XrDRcQX7aMw==
dependencies:
"@budibase/types" "^1.3.11"
"@budibase/types" "^1.3.12"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -1179,13 +1179,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@1.3.11":
version "1.3.11"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.11.tgz#f21a31b13557effd6694c19c56aa6abca1853f93"
integrity sha512-L1UpN81SX3XKoMr9YqHQpOTKnxe3j0hixlOlJlFTU5bVWPVv0CGFAWnc7cDXlpVT8frgpyajNwrf6irNB4P7zw==
"@budibase/pro@1.3.12":
version "1.3.12"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.12.tgz#8a92d98e297375bdd6e311ffb8002f13c3af909f"
integrity sha512-luKQPVyiIxu4Jjq1zw2W2YfkJwC9hDq/lEQfMhbwMDfROZ9opbwokg37SVWbYzqqt8NrQ1uZFt5ieWHF937NoA==
dependencies:
"@budibase/backend-core" "1.3.11"
"@budibase/types" "1.3.11"
"@budibase/backend-core" "1.3.12"
"@budibase/types" "1.3.12"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
@ -1208,10 +1208,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@1.3.11", "@budibase/types@^1.3.11":
version "1.3.11"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.11.tgz#41f2a5c7274e305751636df4aa645d5b418cbe7f"
integrity sha512-hXDqWxH0nVRlgU7CiaqAbD7txdctBed6ZSLmNUD0a2LGY/yueR6MbAO04TD5kXDGvLsEnjxcSWI2N+/GvzqluA==
"@budibase/types@1.3.12", "@budibase/types@^1.3.12":
version "1.3.12"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.12.tgz#5d6cef221085a8ac1c348afa151684a2cebab4bd"
integrity sha512-c+TXAu7j9PeH7o4lOE57fPXj9uJf7MzwJxYvjD0fT962zzCgtseeK9XhD0zF8HERoBc01V3ooNniUWT9llC/Ew==
"@bull-board/api@3.7.0":
version "3.7.0"

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

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "1.3.11",
"version": "1.3.12",
"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": "1.3.11",
"version": "1.3.12",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

10
packages/worker/package.json
View file

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.3.11",
"version": "1.3.12",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -35,10 +35,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "^1.3.11",
"@budibase/pro": "1.3.11",
"@budibase/string-templates": "^1.3.11",
"@budibase/types": "^1.3.11",
"@budibase/backend-core": "^1.3.12",
"@budibase/pro": "1.3.12",
"@budibase/string-templates": "^1.3.12",
"@budibase/types": "^1.3.12",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@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"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.3.11":
version "1.3.11"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.11.tgz#ecd2125a97d7edd8c290caea659af01b08d456f7"
integrity sha512-JwZlHml5E4BCSRc94dUvM88ZWb6ZKogdaws366XQy0aa70z7M191LpsPP3x3mKZDg4H2hNNv2k4mQZBQBv0l8A==
"@budibase/backend-core@1.3.12":
version "1.3.12"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.12.tgz#dd5fbfe791b46343e783b9b23ff6f6e22d77ce1c"
integrity sha512-+fRBrf66peeNXzY5WA3y7Dz6Gl6EUYQI0/zswCddtZhs5+x1cFJZLLRu2V1MFJ41z+cNiw0Pru1XrDRcQX7aMw==
dependencies:
"@budibase/types" "^1.3.11"
"@budibase/types" "^1.3.12"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -326,21 +326,21 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/pro@1.3.11":
version "1.3.11"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.11.tgz#f21a31b13557effd6694c19c56aa6abca1853f93"
integrity sha512-L1UpN81SX3XKoMr9YqHQpOTKnxe3j0hixlOlJlFTU5bVWPVv0CGFAWnc7cDXlpVT8frgpyajNwrf6irNB4P7zw==
"@budibase/pro@1.3.12":
version "1.3.12"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.12.tgz#8a92d98e297375bdd6e311ffb8002f13c3af909f"
integrity sha512-luKQPVyiIxu4Jjq1zw2W2YfkJwC9hDq/lEQfMhbwMDfROZ9opbwokg37SVWbYzqqt8NrQ1uZFt5ieWHF937NoA==
dependencies:
"@budibase/backend-core" "1.3.11"
"@budibase/types" "1.3.11"
"@budibase/backend-core" "1.3.12"
"@budibase/types" "1.3.12"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@1.3.11", "@budibase/types@^1.3.11":
version "1.3.11"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.11.tgz#41f2a5c7274e305751636df4aa645d5b418cbe7f"
integrity sha512-hXDqWxH0nVRlgU7CiaqAbD7txdctBed6ZSLmNUD0a2LGY/yueR6MbAO04TD5kXDGvLsEnjxcSWI2N+/GvzqluA==
"@budibase/types@1.3.12", "@budibase/types@^1.3.12":
version "1.3.12"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.12.tgz#5d6cef221085a8ac1c348afa151684a2cebab4bd"
integrity sha512-c+TXAu7j9PeH7o4lOE57fPXj9uJf7MzwJxYvjD0fT962zzCgtseeK9XhD0zF8HERoBc01V3ooNniUWT9llC/Ew==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"