From e9a43925f76dc6f751a658f1abd3b5d65179a7bd Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 20 May 2021 12:55:24 +0100 Subject: [PATCH 1/5] lint --- packages/server/src/utilities/queue/inMemoryQueue.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/server/src/utilities/queue/inMemoryQueue.js b/packages/server/src/utilities/queue/inMemoryQueue.js index 1a9fc90d5c..d4b1d297d8 100644 --- a/packages/server/src/utilities/queue/inMemoryQueue.js +++ b/packages/server/src/utilities/queue/inMemoryQueue.js @@ -80,6 +80,7 @@ class InMemoryQueue { */ removeRepeatableByKey(cronJobId) { // TODO: implement for testing + console.log(cronJobId) } } From fd9f4a30276307dbb9f3296b472f283a16919dad Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 20 May 2021 14:49:19 +0100 Subject: [PATCH 2/5] v0.9.0 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 10 +++++----- packages/standard-components/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lerna.json b/lerna.json index 90690dbf98..2c9abcbc84 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.8.18", + "version": "0.9.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index 42bc76f3f4..7b89db034d 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.18.6", + "version": "0.9.0", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index c4c7e14b4b..c735af3f06 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": "1.58.13", + "version": "0.9.0", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 7d86c79c70..b00edc0dfd 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.8.18", + "version": "0.9.0", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.58.13", - "@budibase/client": "^0.8.18", + "@budibase/bbui": "^0.9.0", + "@budibase/client": "^0.9.0", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.8.18", + "@budibase/string-templates": "^0.9.0", "@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 0630d0b0c9..dc7e7174e8 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "cli", - "version": "0.8.18", + "version": "0.9.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index f5f4632de9..51e3535784 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.8.18", + "version": "0.9.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -18,15 +18,15 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/string-templates": "^0.8.18", + "@budibase/string-templates": "^0.9.0", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" }, "devDependencies": { + "@budibase/standard-components": "^0.9.0", "@rollup/plugin-commonjs": "^18.0.0", "@rollup/plugin-node-resolve": "^11.2.1", - "@budibase/standard-components": "^0.8.18", "fs-extra": "^8.1.0", "jsdom": "^16.0.1", "postcss": "^8.2.9", diff --git a/packages/server/package.json b/packages/server/package.json index dd345e8907..d4c92c14d3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.8.18", + "version": "0.9.0", "description": "Budibase Web Server", "main": "src/electron.js", "repository": { @@ -80,9 +80,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.18.6", - "@budibase/client": "^0.8.18", - "@budibase/string-templates": "^0.8.18", + "@budibase/auth": "^0.9.0", + "@budibase/client": "^0.9.0", + "@budibase/string-templates": "^0.9.0", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -132,7 +132,7 @@ "zlib": "1.0.5" }, "devDependencies": { - "@budibase/standard-components": "^0.8.18", + "@budibase/standard-components": "^0.9.0", "@jest/test-sequencer": "^24.8.0", "docker-compose": "^0.23.6", "eslint": "^6.8.0", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index 6d58d25144..c4acea217f 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,11 +29,11 @@ "keywords": [ "svelte" ], - "version": "0.8.18", + "version": "0.9.0", "license": "MIT", "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321", "dependencies": { - "@budibase/bbui": "^1.58.13", + "@budibase/bbui": "^0.9.0", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", "apexcharts": "^3.22.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 5e8e06bc33..b86b63fd97 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.8.18", + "version": "0.9.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 636e9b3eab..606e62b8bc 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.8.18", + "version": "0.9.0", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -21,8 +21,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.18.6", - "@budibase/string-templates": "^0.8.16", + "@budibase/auth": "^0.9.0", + "@budibase/string-templates": "^0.9.0", "@koa/router": "^8.0.0", "aws-sdk": "^2.811.0", "bcryptjs": "^2.4.3", From 7103df00138edb13711370d8c8ad0685a9318cce Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 20 May 2021 14:53:22 +0100 Subject: [PATCH 3/5] v0.9.1 --- lerna.json | 2 +- packages/auth/package.json | 5 +++-- packages/bbui/package.json | 5 +++-- packages/builder/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/server/package.json | 12 ++++++------ packages/standard-components/package.json | 6 +++--- packages/string-templates/package.json | 4 ++-- packages/worker/package.json | 9 +++++---- 9 files changed, 31 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 2c9abcbc84..fa5307c017 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.0", + "version": "0.9.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index 7b89db034d..d8003df421 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.0", + "version": "0.9.1", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", @@ -24,5 +24,6 @@ }, "devDependencies": { "ioredis-mock": "^5.5.5" - } + }, + "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" } diff --git a/packages/bbui/package.json b/packages/bbui/package.json index c735af3f06..18e2924198 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": "0.9.0", + "version": "0.9.1", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -77,5 +77,6 @@ "dayjs": "^1.10.4", "svelte-flatpickr": "^3.1.0", "svelte-portal": "^1.0.0" - } + }, + "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" } diff --git a/packages/builder/package.json b/packages/builder/package.json index b00edc0dfd..acc8c71a10 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.0", + "version": "0.9.1", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.0", - "@budibase/client": "^0.9.0", + "@budibase/bbui": "^0.9.1", + "@budibase/client": "^0.9.1", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.0", + "@budibase/string-templates": "^0.9.1", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/client/package.json b/packages/client/package.json index 51e3535784..b4ab3754a0 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.0", + "version": "0.9.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -18,13 +18,13 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/string-templates": "^0.9.0", + "@budibase/string-templates": "^0.9.1", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" }, "devDependencies": { - "@budibase/standard-components": "^0.9.0", + "@budibase/standard-components": "^0.9.1", "@rollup/plugin-commonjs": "^18.0.0", "@rollup/plugin-node-resolve": "^11.2.1", "fs-extra": "^8.1.0", @@ -40,5 +40,5 @@ "rollup-plugin-terser": "^7.0.2", "svelte": "^3.38.2" }, - "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321" + "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" } diff --git a/packages/server/package.json b/packages/server/package.json index d4c92c14d3..5afb4db968 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.0", + "version": "0.9.1", "description": "Budibase Web Server", "main": "src/electron.js", "repository": { @@ -80,9 +80,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.0", - "@budibase/client": "^0.9.0", - "@budibase/string-templates": "^0.9.0", + "@budibase/auth": "^0.9.1", + "@budibase/client": "^0.9.1", + "@budibase/string-templates": "^0.9.1", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -132,7 +132,7 @@ "zlib": "1.0.5" }, "devDependencies": { - "@budibase/standard-components": "^0.9.0", + "@budibase/standard-components": "^0.9.1", "@jest/test-sequencer": "^24.8.0", "docker-compose": "^0.23.6", "eslint": "^6.8.0", @@ -142,5 +142,5 @@ "pouchdb-adapter-memory": "^7.2.1", "supertest": "^4.0.2" }, - "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321" + "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" } diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index c4acea217f..d85097aa21 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,11 +29,11 @@ "keywords": [ "svelte" ], - "version": "0.9.0", + "version": "0.9.1", "license": "MIT", - "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321", + "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", "dependencies": { - "@budibase/bbui": "^0.9.0", + "@budibase/bbui": "^0.9.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", "apexcharts": "^3.22.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b86b63fd97..8ea3663d49 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.0", + "version": "0.9.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", @@ -39,5 +39,5 @@ "rollup-plugin-terser": "^7.0.2", "typescript": "^4.1.3" }, - "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321" + "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" } diff --git a/packages/worker/package.json b/packages/worker/package.json index 606e62b8bc..ac59d7450e 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.0", + "version": "0.9.1", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -21,8 +21,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.0", - "@budibase/string-templates": "^0.9.0", + "@budibase/auth": "^0.9.1", + "@budibase/string-templates": "^0.9.1", "@koa/router": "^8.0.0", "aws-sdk": "^2.811.0", "bcryptjs": "^2.4.3", @@ -58,5 +58,6 @@ "setupFiles": [ "./scripts/jestSetup.js" ] - } + }, + "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" } From 7a73a39d332a9b1d42548336615ab8d8ef1f2b8f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 20 May 2021 21:06:08 +0100 Subject: [PATCH 4/5] fixes for production envoy config --- hosting/envoy.yaml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/hosting/envoy.yaml b/hosting/envoy.yaml index 95db418352..463b32ab60 100644 --- a/hosting/envoy.yaml +++ b/hosting/envoy.yaml @@ -21,15 +21,27 @@ static_resources: cluster: app-service prefix_rewrite: "/" - - match: { path: "/" } + - match: { prefix: "/builder/" } + route: + cluster: app-service + + - match: { prefix: "/builder" } + route: + cluster: app-service + + - match: { prefix: "/app_" } route: cluster: app-service # special case for worker admin API - - match: { path: "/api/admin" } + - match: { prefix: "/api/admin/" } route: cluster: worker-service - + + - match: { path: "/" } + route: + cluster: app-service + # special case for when API requests are made, can just forward, not to minio - match: { prefix: "/api/" } route: From e83f600b9e54ed7bf502144a3422711e7434b88e Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 20 May 2021 21:42:27 +0100 Subject: [PATCH 5/5] removing skip_setup as it was preventing init --- packages/server/src/db/client.js | 1 - packages/worker/src/db/index.js | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/server/src/db/client.js b/packages/server/src/db/client.js index 3e3a4f50fe..fbc25986d5 100644 --- a/packages/server/src/db/client.js +++ b/packages/server/src/db/client.js @@ -12,7 +12,6 @@ PouchDB.adapter("writableStream", replicationStream.adapters.writableStream) let POUCH_DB_DEFAULTS = { prefix: COUCH_DB_URL, - skip_setup: env.isProd(), } if (env.isTest()) { diff --git a/packages/worker/src/db/index.js b/packages/worker/src/db/index.js index 046293a01b..1ade1cd6db 100644 --- a/packages/worker/src/db/index.js +++ b/packages/worker/src/db/index.js @@ -7,7 +7,6 @@ const COUCH_DB_URL = env.COUCH_DB_URL || "http://localhost:10000/db/" let POUCH_DB_DEFAULTS = { prefix: COUCH_DB_URL, - skip_setup: env.isProd(), } if (env.isTest()) {