From 9d813292de00b6c08c3d293accf17b110448f7ea Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 23 May 2022 16:24:29 +0100 Subject: [PATCH 01/12] enable clustering on server and worker services, better log output on user not found errors --- packages/backend-core/src/auth.js | 2 +- packages/backend-core/src/middleware/passport/local.js | 2 +- packages/builder/src/pages/builder/auth/login.svelte | 2 +- packages/server/Dockerfile | 4 +++- packages/server/docker_run.sh | 5 +++++ packages/server/package.json | 1 + packages/server/pm2.js | 9 +++++++++ packages/worker/Dockerfile | 4 +++- packages/worker/docker_run.sh | 5 +++++ packages/worker/package.json | 1 + packages/worker/pm2.js | 9 +++++++++ packages/worker/src/api/controllers/global/configs.js | 4 +--- packages/worker/src/environment.js | 7 +++++++ 13 files changed, 47 insertions(+), 8 deletions(-) create mode 100755 packages/server/docker_run.sh create mode 100644 packages/server/pm2.js create mode 100755 packages/worker/docker_run.sh create mode 100644 packages/worker/pm2.js diff --git a/packages/backend-core/src/auth.js b/packages/backend-core/src/auth.js index f6d53522d5..b13cd932c6 100644 --- a/packages/backend-core/src/auth.js +++ b/packages/backend-core/src/auth.js @@ -29,7 +29,7 @@ passport.deserializeUser(async (user, done) => { const user = await db.get(user._id) return done(null, user) } catch (err) { - console.error("User not found", err) + console.error(`User not found`, err) return done(null, false, { message: "User not found" }) } }) diff --git a/packages/backend-core/src/middleware/passport/local.js b/packages/backend-core/src/middleware/passport/local.js index 2149bd3e18..716ebc1755 100644 --- a/packages/backend-core/src/middleware/passport/local.js +++ b/packages/backend-core/src/middleware/passport/local.js @@ -30,7 +30,7 @@ exports.authenticate = async function (ctx, email, password, done) { const dbUser = await getGlobalUserByEmail(email) if (dbUser == null) { - return authError(done, "User not found") + return authError(done, `User not found: [${email}]`) } // check that the user is currently inactive, if this is the case throw invalid diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte index 84af5b6338..c2ec547e38 100644 --- a/packages/builder/src/pages/builder/auth/login.svelte +++ b/packages/builder/src/pages/builder/auth/login.svelte @@ -28,7 +28,7 @@ async function login() { try { await auth.login({ - username, + username: username.trim(), password, }) if ($auth?.user?.forceResetPassword) { diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile index 0ef0fe4244..e5063a88ed 100644 --- a/packages/server/Dockerfile +++ b/packages/server/Dockerfile @@ -16,6 +16,7 @@ ENV BUDIBASE_ENVIRONMENT=PRODUCTION # copy files and install dependencies COPY . ./ RUN yarn +RUN yarn global add pm2 RUN yarn build # Install client for oracle datasource @@ -28,4 +29,5 @@ EXPOSE 4001 # due to this causing yarn to stop installing dev dependencies # which are actually needed to get this environment up and running ENV NODE_ENV=production -CMD ["yarn", "run:docker"] +ENV CLUSTER_MODE=${CLUSTER_MODE} +CMD ["./docker_run.sh"] diff --git a/packages/server/docker_run.sh b/packages/server/docker_run.sh new file mode 100755 index 0000000000..0045fe0c44 --- /dev/null +++ b/packages/server/docker_run.sh @@ -0,0 +1,5 @@ +if [ -z $CLUSTER_MODE ]; then + yarn run:docker +else + yarn run:docker:cluster +fi diff --git a/packages/server/package.json b/packages/server/package.json index f428ad5328..8ebad9923b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -18,6 +18,7 @@ "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION", "build:docs": "node ./scripts/docs/generate.js open", "run:docker": "node dist/index.js", + "run:docker:cluster": "pm2-runtime start pm2.js", "dev:stack:up": "node scripts/dev/manage.js up", "dev:stack:down": "node scripts/dev/manage.js down", "dev:stack:nuke": "node scripts/dev/manage.js nuke", diff --git a/packages/server/pm2.js b/packages/server/pm2.js new file mode 100644 index 0000000000..33829f327c --- /dev/null +++ b/packages/server/pm2.js @@ -0,0 +1,9 @@ +module.exports = { + apps: [ + { + script: "dist/index.js", + instances: "max", + exec_mode: "cluster", + }, + ], +} diff --git a/packages/worker/Dockerfile b/packages/worker/Dockerfile index 614a724ab6..b73efcc4a1 100644 --- a/packages/worker/Dockerfile +++ b/packages/worker/Dockerfile @@ -10,6 +10,7 @@ WORKDIR /app # copy files and install dependencies COPY . ./ RUN yarn +RUN yarn global add pm2 EXPOSE 4001 @@ -17,4 +18,5 @@ EXPOSE 4001 # due to this causing yarn to stop installing dev dependencies # which are actually needed to get this environment up and running ENV NODE_ENV=production -CMD ["yarn", "run:docker"] +ENV CLUSTER_MODE=${CLUSTER_MODE} +CMD ["./docker_run.sh"] diff --git a/packages/worker/docker_run.sh b/packages/worker/docker_run.sh new file mode 100755 index 0000000000..20694e5df0 --- /dev/null +++ b/packages/worker/docker_run.sh @@ -0,0 +1,5 @@ +if [[ -z $CLUSTER_MODE ]]; then + yarn run:docker +else + yarn run:docker:cluster +fi diff --git a/packages/worker/package.json b/packages/worker/package.json index 885f55003e..32b7610d8c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -15,6 +15,7 @@ "build": "rimraf dist/ && tsc", "postbuild": "copyfiles -u 1 src/**/*.hbs dist/", "run:docker": "node dist/index.js", + "run:docker:cluster": "pm2-runtime start pm2.js", "build:docker": "docker build . -t worker-service --label version=$BUDIBASE_RELEASE_VERSION", "dev:stack:init": "node ./scripts/dev/manage.js init", "dev:builder": "npm run dev:stack:init && nodemon", diff --git a/packages/worker/pm2.js b/packages/worker/pm2.js new file mode 100644 index 0000000000..33829f327c --- /dev/null +++ b/packages/worker/pm2.js @@ -0,0 +1,9 @@ +module.exports = { + apps: [ + { + script: "dist/index.js", + instances: "max", + exec_mode: "cluster", + }, + ], +} diff --git a/packages/worker/src/api/controllers/global/configs.js b/packages/worker/src/api/controllers/global/configs.js index 571e102e4c..0301ec354f 100644 --- a/packages/worker/src/api/controllers/global/configs.js +++ b/packages/worker/src/api/controllers/global/configs.js @@ -250,11 +250,9 @@ exports.configChecklist = async function (ctx) { const tenantId = getTenantId() try { - const ONE_MINUTE = 600 - ctx.body = await withCache( `checklist:${tenantId}`, - ONE_MINUTE, + env.CHECKLIST_CACHE_TTL, async () => { let apps = [] if (!env.MULTI_TENANCY || tenantId) { diff --git a/packages/worker/src/environment.js b/packages/worker/src/environment.js index 8ef12e3877..790448d7e8 100644 --- a/packages/worker/src/environment.js +++ b/packages/worker/src/environment.js @@ -20,6 +20,12 @@ if (!LOADED && isDev() && !isTest()) { LOADED = true } +function parseIntSafe(number) { + if (number) { + return parseInt(number) + } +} + module.exports = { NODE_ENV: process.env.NODE_ENV, SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED), @@ -46,6 +52,7 @@ module.exports = { SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS, PLATFORM_URL: process.env.PLATFORM_URL, COOKIE_DOMAIN: process.env.COOKIE_DOMAIN, + CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 600, APPS_URL: process.env.APPS_URL, _set(key, value) { process.env[key] = value From e1bacb7cca9338c763f411d46f41bb5abe71fc8c Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 23 May 2022 16:57:15 +0100 Subject: [PATCH 02/12] making checklist cache length controllable through env var --- .../src/api/controllers/global/configs.js | 103 +++++++++--------- packages/worker/src/environment.js | 4 +- 2 files changed, 56 insertions(+), 51 deletions(-) diff --git a/packages/worker/src/api/controllers/global/configs.js b/packages/worker/src/api/controllers/global/configs.js index 147c5296ce..df3326ef26 100644 --- a/packages/worker/src/api/controllers/global/configs.js +++ b/packages/worker/src/api/controllers/global/configs.js @@ -17,7 +17,6 @@ const { googleCallbackUrl, oidcCallbackUrl } = require("./auth") const { withCache, CacheKeys, - TTL, bustCache, } = require("@budibase/backend-core/cache") @@ -256,58 +255,62 @@ exports.configChecklist = async function (ctx) { const tenantId = getTenantId() try { - ctx.body = await withCache(CacheKeys.CHECKLIST, TTL.ONE_HOUR, async () => { - let apps = [] - if (!env.MULTI_TENANCY || tenantId) { - // Apps exist - apps = await getAllApps({ idsOnly: true, efficient: true }) - } + ctx.body = await withCache( + CacheKeys.CHECKLIST, + env.CHECKLIST_CACHE_TTL, + async () => { + let apps = [] + if (!env.MULTI_TENANCY || tenantId) { + // Apps exist + apps = await getAllApps({ idsOnly: true, efficient: true }) + } - // They have set up SMTP - const smtpConfig = await getScopedFullConfig(db, { - type: Configs.SMTP, - }) - - // They have set up Google Auth - const googleConfig = await getScopedFullConfig(db, { - type: Configs.GOOGLE, - }) - - // They have set up OIDC - const oidcConfig = await getScopedFullConfig(db, { - type: Configs.OIDC, - }) - - // They have set up an global user - const users = await db.allDocs( - getGlobalUserParams(null, { - include_docs: true, - limit: 1, + // They have set up SMTP + const smtpConfig = await getScopedFullConfig(db, { + type: Configs.SMTP, }) - ) - return { - apps: { - checked: apps.length > 0, - label: "Create your first app", - link: "/builder/portal/apps", - }, - smtp: { - checked: !!smtpConfig, - label: "Set up email", - link: "/builder/portal/manage/email", - }, - adminUser: { - checked: users && users.rows.length >= 1, - label: "Create your first user", - link: "/builder/portal/manage/users", - }, - sso: { - checked: !!googleConfig || !!oidcConfig, - label: "Set up single sign-on", - link: "/builder/portal/manage/auth", - }, + + // They have set up Google Auth + const googleConfig = await getScopedFullConfig(db, { + type: Configs.GOOGLE, + }) + + // They have set up OIDC + const oidcConfig = await getScopedFullConfig(db, { + type: Configs.OIDC, + }) + + // They have set up an global user + const users = await db.allDocs( + getGlobalUserParams(null, { + include_docs: true, + limit: 1, + }) + ) + return { + apps: { + checked: apps.length > 0, + label: "Create your first app", + link: "/builder/portal/apps", + }, + smtp: { + checked: !!smtpConfig, + label: "Set up email", + link: "/builder/portal/manage/email", + }, + adminUser: { + checked: users && users.rows.length >= 1, + label: "Create your first user", + link: "/builder/portal/manage/users", + }, + sso: { + checked: !!googleConfig || !!oidcConfig, + label: "Set up single sign-on", + link: "/builder/portal/manage/auth", + }, + } } - }) + ) } catch (err) { ctx.throw(err.status, err) } diff --git a/packages/worker/src/environment.js b/packages/worker/src/environment.js index 790448d7e8..a6a60c0a88 100644 --- a/packages/worker/src/environment.js +++ b/packages/worker/src/environment.js @@ -1,4 +1,5 @@ const { join } = require("path") +const { TTL } = require("@budibase/backend-core/cache") function isDev() { return process.env.NODE_ENV !== "production" @@ -52,7 +53,8 @@ module.exports = { SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS, PLATFORM_URL: process.env.PLATFORM_URL, COOKIE_DOMAIN: process.env.COOKIE_DOMAIN, - CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 600, + CHECKLIST_CACHE_TTL: + parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || TTL.ONE_HOUR, APPS_URL: process.env.APPS_URL, _set(key, value) { process.env[key] = value From d18de6c4c938b3e92b674d674fddc4fc96a0e2b7 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 23 May 2022 17:38:02 +0100 Subject: [PATCH 03/12] prevent issue with TTL dependency import --- packages/server/yarn.lock | 18 +++++++++--------- packages/worker/src/environment.js | 4 +--- packages/worker/yarn.lock | 18 +++++++++--------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 219b5add75..277fda70ca 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1014,10 +1014,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.171": - version "1.0.171" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.171.tgz#39fb68fc1a6e233589cf65e8354ff5e5098b4b4e" - integrity sha512-au7nP2x4Oj/5PCU7qd538FDrz/Dhq9nSX6AjR+3+hoU658Gv3xes4RKXgFjf5qE0tdSKTSe1pMntMhwQxshUBQ== +"@budibase/backend-core@1.0.172": + version "1.0.172" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.172.tgz#81f825d5e141fbcbad085202509e1f97dfed0dfc" + integrity sha512-JDyR646dhDmQMWqeJxkdD70wyFv26hfNgRl768sgCgN4fG9B8829QsKeNjOquZf+U2diaKbDmKX+f/7gqoA5FQ== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -1091,12 +1091,12 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.0.171": - version "1.0.171" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.171.tgz#b64de1e3b80407bd004d4cf6e2b247f0b7855c02" - integrity sha512-iTu63sm/DA6AJbVNOnASZ03mPR6GFJf5rLRE672XMF2ftQ2WcjDx9QIuwKF4aPWQqB7LuzX8/isNugNYzgNuVw== +"@budibase/pro@1.0.172": + version "1.0.172" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.172.tgz#c6fe078098c72b8d163cfcf62d5389a9ca937b20" + integrity sha512-hHNobwr+8G99ofi9zp0cGB13iIC0StEV3JdF2a2HXwB4NzMz4b0vJ6VfcB1J+nVJPEe42DWmJViwJkuSX0jGhw== dependencies: - "@budibase/backend-core" "1.0.171" + "@budibase/backend-core" "1.0.172" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": diff --git a/packages/worker/src/environment.js b/packages/worker/src/environment.js index a6a60c0a88..4d65d5d834 100644 --- a/packages/worker/src/environment.js +++ b/packages/worker/src/environment.js @@ -1,5 +1,4 @@ const { join } = require("path") -const { TTL } = require("@budibase/backend-core/cache") function isDev() { return process.env.NODE_ENV !== "production" @@ -53,8 +52,7 @@ module.exports = { SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS, PLATFORM_URL: process.env.PLATFORM_URL, COOKIE_DOMAIN: process.env.COOKIE_DOMAIN, - CHECKLIST_CACHE_TTL: - parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || TTL.ONE_HOUR, + CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 3600, APPS_URL: process.env.APPS_URL, _set(key, value) { process.env[key] = value diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 832422f224..57cf9f09af 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -293,10 +293,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.171": - version "1.0.171" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.171.tgz#39fb68fc1a6e233589cf65e8354ff5e5098b4b4e" - integrity sha512-au7nP2x4Oj/5PCU7qd538FDrz/Dhq9nSX6AjR+3+hoU658Gv3xes4RKXgFjf5qE0tdSKTSe1pMntMhwQxshUBQ== +"@budibase/backend-core@1.0.172": + version "1.0.172" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.172.tgz#81f825d5e141fbcbad085202509e1f97dfed0dfc" + integrity sha512-JDyR646dhDmQMWqeJxkdD70wyFv26hfNgRl768sgCgN4fG9B8829QsKeNjOquZf+U2diaKbDmKX+f/7gqoA5FQ== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -321,12 +321,12 @@ uuid "^8.3.2" zlib "^1.0.5" -"@budibase/pro@1.0.171": - version "1.0.171" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.171.tgz#b64de1e3b80407bd004d4cf6e2b247f0b7855c02" - integrity sha512-iTu63sm/DA6AJbVNOnASZ03mPR6GFJf5rLRE672XMF2ftQ2WcjDx9QIuwKF4aPWQqB7LuzX8/isNugNYzgNuVw== +"@budibase/pro@1.0.172": + version "1.0.172" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.172.tgz#c6fe078098c72b8d163cfcf62d5389a9ca937b20" + integrity sha512-hHNobwr+8G99ofi9zp0cGB13iIC0StEV3JdF2a2HXwB4NzMz4b0vJ6VfcB1J+nVJPEe42DWmJViwJkuSX0jGhw== dependencies: - "@budibase/backend-core" "1.0.171" + "@budibase/backend-core" "1.0.172" node-fetch "^2.6.1" "@cspotcode/source-map-consumer@0.8.0": From 4c8dceb5cffd54bf1370e46d619020aada5031b7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 23 May 2022 17:14:13 +0000 Subject: [PATCH 04/12] v1.0.173 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 39916bf0ba..f1aac195e4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.172", + "version": "1.0.173", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0158525844..f0d42a006d 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.172", + "version": "1.0.173", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 61d3a5af20..626e8beeb3 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.0.172", + "version": "1.0.173", "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.0.172", + "@budibase/string-templates": "^1.0.173", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 119e0b9b55..7474c2b123 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.172", + "version": "1.0.173", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.172", - "@budibase/client": "^1.0.172", - "@budibase/frontend-core": "^1.0.172", - "@budibase/string-templates": "^1.0.172", + "@budibase/bbui": "^1.0.173", + "@budibase/client": "^1.0.173", + "@budibase/frontend-core": "^1.0.173", + "@budibase/string-templates": "^1.0.173", "@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 423b854d1b..361b030de9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.172", + "version": "1.0.173", "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 bed4ccdd44..1a07441d86 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.172", + "version": "1.0.173", "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.0.172", - "@budibase/frontend-core": "^1.0.172", - "@budibase/string-templates": "^1.0.172", + "@budibase/bbui": "^1.0.173", + "@budibase/frontend-core": "^1.0.173", + "@budibase/string-templates": "^1.0.173", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 772746ed9a..33122df856 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.172", + "version": "1.0.173", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.172", + "@budibase/bbui": "^1.0.173", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index cd04beef2b..e849fa1162 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.172", + "version": "1.0.173", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.172", - "@budibase/client": "^1.0.172", + "@budibase/backend-core": "^1.0.173", + "@budibase/client": "^1.0.173", "@budibase/pro": "1.0.172", - "@budibase/string-templates": "^1.0.172", + "@budibase/string-templates": "^1.0.173", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 04c37ead25..d1e1661096 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.172", + "version": "1.0.173", "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 f94dd15c73..d72c86e9c9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.172", + "version": "1.0.173", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.172", + "@budibase/backend-core": "^1.0.173", "@budibase/pro": "1.0.172", - "@budibase/string-templates": "^1.0.172", + "@budibase/string-templates": "^1.0.173", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From aa6380a85675216d42be6e3c0ccd0dfadc3d69f5 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 23 May 2022 17:15:41 +0000 Subject: [PATCH 05/12] Update pro version to 1.0.173 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index e849fa1162..4b89a11bf2 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.173", "@budibase/client": "^1.0.173", - "@budibase/pro": "1.0.172", + "@budibase/pro": "1.0.173", "@budibase/string-templates": "^1.0.173", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index d72c86e9c9..e8fc824080 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.173", - "@budibase/pro": "1.0.172", + "@budibase/pro": "1.0.173", "@budibase/string-templates": "^1.0.173", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From fb1a10d50b0a55437a1d9867200b2a327ec6f299 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 23 May 2022 19:13:02 +0100 Subject: [PATCH 06/12] updating pm2 config files to be named correctly so commands are picked up --- packages/server/package.json | 2 +- packages/server/{pm2.js => pm2.config.js} | 2 +- packages/worker/package.json | 2 +- packages/worker/{pm2.js => pm2.config.js} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename packages/server/{pm2.js => pm2.config.js} (81%) rename packages/worker/{pm2.js => pm2.config.js} (75%) diff --git a/packages/server/package.json b/packages/server/package.json index 4b89a11bf2..d052651b69 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -18,7 +18,7 @@ "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION", "build:docs": "node ./scripts/docs/generate.js open", "run:docker": "node dist/index.js", - "run:docker:cluster": "pm2-runtime start pm2.js", + "run:docker:cluster": "pm2-runtime start pm2.config.js", "dev:stack:up": "node scripts/dev/manage.js up", "dev:stack:down": "node scripts/dev/manage.js down", "dev:stack:nuke": "node scripts/dev/manage.js nuke", diff --git a/packages/server/pm2.js b/packages/server/pm2.config.js similarity index 81% rename from packages/server/pm2.js rename to packages/server/pm2.config.js index 33829f327c..31cbab5d6c 100644 --- a/packages/server/pm2.js +++ b/packages/server/pm2.config.js @@ -2,7 +2,7 @@ module.exports = { apps: [ { script: "dist/index.js", - instances: "max", + instances: "4", exec_mode: "cluster", }, ], diff --git a/packages/worker/package.json b/packages/worker/package.json index e8fc824080..238dd5b6e2 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -15,7 +15,7 @@ "build": "rimraf dist/ && tsc", "postbuild": "copyfiles -u 1 src/**/*.hbs dist/", "run:docker": "node dist/index.js", - "run:docker:cluster": "pm2-runtime start pm2.js", + "run:docker:cluster": "pm2-runtime start pm2.config.js", "build:docker": "docker build . -t worker-service --label version=$BUDIBASE_RELEASE_VERSION", "dev:stack:init": "node ./scripts/dev/manage.js init", "dev:builder": "npm run dev:stack:init && nodemon", diff --git a/packages/worker/pm2.js b/packages/worker/pm2.config.js similarity index 75% rename from packages/worker/pm2.js rename to packages/worker/pm2.config.js index 33829f327c..b5fb1880ef 100644 --- a/packages/worker/pm2.js +++ b/packages/worker/pm2.config.js @@ -1,7 +1,7 @@ module.exports = { apps: [ { - script: "dist/index.js", + script: "./dist/index.js", instances: "max", exec_mode: "cluster", }, From 4328f5926c08e4f1b801210b4d9d021a62461216 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 23 May 2022 19:16:11 +0100 Subject: [PATCH 07/12] Update pm2.config.js --- packages/server/pm2.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/pm2.config.js b/packages/server/pm2.config.js index 31cbab5d6c..33829f327c 100644 --- a/packages/server/pm2.config.js +++ b/packages/server/pm2.config.js @@ -2,7 +2,7 @@ module.exports = { apps: [ { script: "dist/index.js", - instances: "4", + instances: "max", exec_mode: "cluster", }, ], From b8737ef665c2f1d67d1092b909e8248f158b9567 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 23 May 2022 18:24:18 +0000 Subject: [PATCH 08/12] v1.0.174 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index f1aac195e4..10717bc007 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.173", + "version": "1.0.174", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f0d42a006d..30c3cfb937 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.173", + "version": "1.0.174", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 626e8beeb3..ee1e73c387 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.0.173", + "version": "1.0.174", "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.0.173", + "@budibase/string-templates": "^1.0.174", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 7474c2b123..e33f90f707 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.173", + "version": "1.0.174", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.173", - "@budibase/client": "^1.0.173", - "@budibase/frontend-core": "^1.0.173", - "@budibase/string-templates": "^1.0.173", + "@budibase/bbui": "^1.0.174", + "@budibase/client": "^1.0.174", + "@budibase/frontend-core": "^1.0.174", + "@budibase/string-templates": "^1.0.174", "@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 361b030de9..711437f8fc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.173", + "version": "1.0.174", "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 1a07441d86..2e3f9c1018 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.173", + "version": "1.0.174", "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.0.173", - "@budibase/frontend-core": "^1.0.173", - "@budibase/string-templates": "^1.0.173", + "@budibase/bbui": "^1.0.174", + "@budibase/frontend-core": "^1.0.174", + "@budibase/string-templates": "^1.0.174", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 33122df856..7827d4986e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.173", + "version": "1.0.174", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.173", + "@budibase/bbui": "^1.0.174", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index d052651b69..854ca33bcd 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.173", + "version": "1.0.174", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.173", - "@budibase/client": "^1.0.173", + "@budibase/backend-core": "^1.0.174", + "@budibase/client": "^1.0.174", "@budibase/pro": "1.0.173", - "@budibase/string-templates": "^1.0.173", + "@budibase/string-templates": "^1.0.174", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d1e1661096..bd50bf1b99 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.173", + "version": "1.0.174", "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 238dd5b6e2..f46225793d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.173", + "version": "1.0.174", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.173", + "@budibase/backend-core": "^1.0.174", "@budibase/pro": "1.0.173", - "@budibase/string-templates": "^1.0.173", + "@budibase/string-templates": "^1.0.174", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From c6a8f5ec3a97a8fd20a5bedd1fb03a8f0a5bf99d Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 23 May 2022 18:25:37 +0000 Subject: [PATCH 09/12] Update pro version to 1.0.174 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 854ca33bcd..69efa55ccb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.174", "@budibase/client": "^1.0.174", - "@budibase/pro": "1.0.173", + "@budibase/pro": "1.0.174", "@budibase/string-templates": "^1.0.174", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index f46225793d..800ede6a90 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.174", - "@budibase/pro": "1.0.173", + "@budibase/pro": "1.0.174", "@budibase/string-templates": "^1.0.174", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 484dbbb6051f52ac84f7afd988cb9b761ca8eaa8 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 23 May 2022 23:23:49 +0100 Subject: [PATCH 10/12] Adding the ability to force a new context. --- packages/backend-core/src/context/index.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/backend-core/src/context/index.js b/packages/backend-core/src/context/index.js index 20e5e26693..3abbc84596 100644 --- a/packages/backend-core/src/context/index.js +++ b/packages/backend-core/src/context/index.js @@ -73,7 +73,7 @@ exports.isMultiTenant = () => { } // used for automations, API endpoints should always be in context already -exports.doInTenant = (tenantId, task) => { +exports.doInTenant = (tenantId, task, { forceNew } = {}) => { // the internal function is so that we can re-use an existing // context - don't want to close DB on a parent context async function internal(opts = { existing: false }) { @@ -98,7 +98,11 @@ exports.doInTenant = (tenantId, task) => { } } const using = cls.getFromContext(ContextKeys.IN_USE) - if (using && cls.getFromContext(ContextKeys.TENANT_ID) === tenantId) { + if ( + !forceNew && + using && + cls.getFromContext(ContextKeys.TENANT_ID) === tenantId + ) { cls.setOnContext(ContextKeys.IN_USE, using + 1) return internal({ existing: true }) } else { @@ -135,7 +139,7 @@ const setAppTenantId = appId => { exports.updateTenantId(appTenantId) } -exports.doInAppContext = (appId, task) => { +exports.doInAppContext = (appId, task, { forceNew } = {}) => { if (!appId) { throw new Error("appId is required") } @@ -162,7 +166,7 @@ exports.doInAppContext = (appId, task) => { } } const using = cls.getFromContext(ContextKeys.IN_USE) - if (using && cls.getFromContext(ContextKeys.APP_ID) === appId) { + if (!forceNew && using && cls.getFromContext(ContextKeys.APP_ID) === appId) { cls.setOnContext(ContextKeys.IN_USE, using + 1) return internal({ existing: true }) } else { From 15d3ecaa7b4b7b22aa38e5d602e39096c5bf8491 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 23 May 2022 22:32:31 +0000 Subject: [PATCH 11/12] v1.0.175 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 10717bc007..fd289506fa 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.174", + "version": "1.0.175", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 30c3cfb937..39a2fc186a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.174", + "version": "1.0.175", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index ee1e73c387..e26a5dc113 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.0.174", + "version": "1.0.175", "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.0.174", + "@budibase/string-templates": "^1.0.175", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index e33f90f707..f39bc03740 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.174", + "version": "1.0.175", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.174", - "@budibase/client": "^1.0.174", - "@budibase/frontend-core": "^1.0.174", - "@budibase/string-templates": "^1.0.174", + "@budibase/bbui": "^1.0.175", + "@budibase/client": "^1.0.175", + "@budibase/frontend-core": "^1.0.175", + "@budibase/string-templates": "^1.0.175", "@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 711437f8fc..fb2e593c20 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.174", + "version": "1.0.175", "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 2e3f9c1018..6ea3f166c3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.174", + "version": "1.0.175", "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.0.174", - "@budibase/frontend-core": "^1.0.174", - "@budibase/string-templates": "^1.0.174", + "@budibase/bbui": "^1.0.175", + "@budibase/frontend-core": "^1.0.175", + "@budibase/string-templates": "^1.0.175", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 7827d4986e..e87e7f6e77 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.174", + "version": "1.0.175", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.174", + "@budibase/bbui": "^1.0.175", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 69efa55ccb..b3f3ce48a6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.174", + "version": "1.0.175", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.174", - "@budibase/client": "^1.0.174", + "@budibase/backend-core": "^1.0.175", + "@budibase/client": "^1.0.175", "@budibase/pro": "1.0.174", - "@budibase/string-templates": "^1.0.174", + "@budibase/string-templates": "^1.0.175", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index bd50bf1b99..77916aca77 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.174", + "version": "1.0.175", "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 800ede6a90..815dfdda47 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.174", + "version": "1.0.175", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.174", + "@budibase/backend-core": "^1.0.175", "@budibase/pro": "1.0.174", - "@budibase/string-templates": "^1.0.174", + "@budibase/string-templates": "^1.0.175", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From ed1099470ee559e25cade6373ee8c9144bbcf61b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 23 May 2022 22:33:53 +0000 Subject: [PATCH 12/12] Update pro version to 1.0.175 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index b3f3ce48a6..fd86e08780 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.175", "@budibase/client": "^1.0.175", - "@budibase/pro": "1.0.174", + "@budibase/pro": "1.0.175", "@budibase/string-templates": "^1.0.175", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 815dfdda47..5e0cd96397 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.175", - "@budibase/pro": "1.0.174", + "@budibase/pro": "1.0.175", "@budibase/string-templates": "^1.0.175", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7",