diff --git a/lerna.json b/lerna.json index 30ecfdb752..11a729658b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.185-alpha.7", + "version": "1.0.187", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index e2a61bcceb..2f25a24f90 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.185-alpha.7", + "version": "1.0.187", "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 a0fbdd3d33..e4cd099e6e 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.185-alpha.7", + "version": "1.0.187", "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.185-alpha.7", + "@budibase/string-templates": "^1.0.187", "@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 81a71b3069..c313a83a93 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.185-alpha.7", + "version": "1.0.187", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.185-alpha.7", - "@budibase/client": "^1.0.185-alpha.7", - "@budibase/frontend-core": "^1.0.185-alpha.7", - "@budibase/string-templates": "^1.0.185-alpha.7", + "@budibase/bbui": "^1.0.187", + "@budibase/client": "^1.0.187", + "@budibase/frontend-core": "^1.0.187", + "@budibase/string-templates": "^1.0.187", "@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 6452f957de..723b4d2b35 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.185-alpha.7", + "version": "1.0.187", "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 58ffa38ce7..efab1c77ee 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.185-alpha.7", + "version": "1.0.187", "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.185-alpha.7", - "@budibase/frontend-core": "^1.0.185-alpha.7", - "@budibase/string-templates": "^1.0.185-alpha.7", + "@budibase/bbui": "^1.0.187", + "@budibase/frontend-core": "^1.0.187", + "@budibase/string-templates": "^1.0.187", "@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 f48732ba6b..f6be6519a5 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.185-alpha.7", + "version": "1.0.187", "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.185-alpha.7", + "@budibase/bbui": "^1.0.187", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile index e5063a88ed..d8ad37d80b 100644 --- a/packages/server/Dockerfile +++ b/packages/server/Dockerfile @@ -15,7 +15,9 @@ ENV BUDIBASE_ENVIRONMENT=PRODUCTION # copy files and install dependencies COPY . ./ -RUN yarn +# handle node-gyp +RUN apk add --no-cache --virtual .gyp python3 make g++ \ + && yarn && apk del .gyp RUN yarn global add pm2 RUN yarn build diff --git a/packages/server/docker_run.sh b/packages/server/docker_run.sh index 0045fe0c44..d40e84177a 100755 --- a/packages/server/docker_run.sh +++ b/packages/server/docker_run.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + if [ -z $CLUSTER_MODE ]; then yarn run:docker else diff --git a/packages/server/package.json b/packages/server/package.json index c869394f9e..e24f632f96 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.185-alpha.7", + "version": "1.0.187", "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.185-alpha.7", - "@budibase/client": "^1.0.185-alpha.7", - "@budibase/pro": "1.0.185-alpha.7", - "@budibase/string-templates": "^1.0.185-alpha.7", + "@budibase/backend-core": "^1.0.187", + "@budibase/client": "^1.0.187", + "@budibase/pro": "1.0.187", + "@budibase/string-templates": "^1.0.187", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 5296755702..0c2e0d8733 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.184": - version "1.0.184" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.184.tgz#509208a78dc897c1e97f81248ab84550fa3d8f6e" - integrity sha512-pxJyWdo2Fjmn9doCgMASjiRAv90fcZMKJpIc922eYQcZtQbzZOFu4BcpmZoGg6dR0ZQinzIsy+UQPV36Q2ciMQ== +"@budibase/backend-core@1.0.187": + version "1.0.187" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.187.tgz#bf2d6de627185e5388d567762491334bc1d2d546" + integrity sha512-C9FqOf+/SNNWk7bZU7PfnzDvXM5ntnZFgpX1bI/bfHH3xYGw6jOFB2BpoTaV2sQGq14wfmo9e9vNHqYIT9tPrg== 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.184": - version "1.0.184" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.184.tgz#7be3a46a50a82fb8f4dc295d5aca4f45442da4c6" - integrity sha512-IBm4GsQhT3xlkO09B77nupGePlHLc8bv8NQcezdglqHLwi9HTIOSyUMFlqp3gGFy7IuD9Gy9eMXcxnemWV77Gw== +"@budibase/pro@1.0.187": + version "1.0.187" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.187.tgz#40ed5e9809f924e5d0c7bbb7d09a602ea47dfe92" + integrity sha512-whEcWAcgkIL4EHgh08jp8itR37LZYlZxFLl0GYY5AOIguEScJ1FRe9WcYFNW0Pw768uaq7IE7hKkrAzWetzu4g== dependencies: - "@budibase/backend-core" "1.0.184" + "@budibase/backend-core" "1.0.187" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 4433c5faa0..5cc329ee7b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.185-alpha.7", + "version": "1.0.187", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/Dockerfile b/packages/worker/Dockerfile index b73efcc4a1..8d6abc6ad1 100644 --- a/packages/worker/Dockerfile +++ b/packages/worker/Dockerfile @@ -9,7 +9,9 @@ WORKDIR /app # copy files and install dependencies COPY . ./ -RUN yarn +# handle node-gyp +RUN apk add --no-cache --virtual .gyp python3 make g++ \ + && yarn && apk del .gyp RUN yarn global add pm2 EXPOSE 4001 diff --git a/packages/worker/docker_run.sh b/packages/worker/docker_run.sh index 20694e5df0..e80f3e1658 100755 --- a/packages/worker/docker_run.sh +++ b/packages/worker/docker_run.sh @@ -1,3 +1,5 @@ +#!/bin/sh + if [[ -z $CLUSTER_MODE ]]; then yarn run:docker else diff --git a/packages/worker/package.json b/packages/worker/package.json index 21aa2e7b63..8f5cbd9265 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.185-alpha.7", + "version": "1.0.187", "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.185-alpha.7", - "@budibase/pro": "1.0.185-alpha.7", - "@budibase/string-templates": "^1.0.185-alpha.7", + "@budibase/backend-core": "^1.0.187", + "@budibase/pro": "1.0.187", + "@budibase/string-templates": "^1.0.187", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 61e6b8759d..679b7093af 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.184": - version "1.0.184" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.184.tgz#509208a78dc897c1e97f81248ab84550fa3d8f6e" - integrity sha512-pxJyWdo2Fjmn9doCgMASjiRAv90fcZMKJpIc922eYQcZtQbzZOFu4BcpmZoGg6dR0ZQinzIsy+UQPV36Q2ciMQ== +"@budibase/backend-core@1.0.187": + version "1.0.187" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.187.tgz#bf2d6de627185e5388d567762491334bc1d2d546" + integrity sha512-C9FqOf+/SNNWk7bZU7PfnzDvXM5ntnZFgpX1bI/bfHH3xYGw6jOFB2BpoTaV2sQGq14wfmo9e9vNHqYIT9tPrg== 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.184": - version "1.0.184" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.184.tgz#7be3a46a50a82fb8f4dc295d5aca4f45442da4c6" - integrity sha512-IBm4GsQhT3xlkO09B77nupGePlHLc8bv8NQcezdglqHLwi9HTIOSyUMFlqp3gGFy7IuD9Gy9eMXcxnemWV77Gw== +"@budibase/pro@1.0.187": + version "1.0.187" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.187.tgz#40ed5e9809f924e5d0c7bbb7d09a602ea47dfe92" + integrity sha512-whEcWAcgkIL4EHgh08jp8itR37LZYlZxFLl0GYY5AOIguEScJ1FRe9WcYFNW0Pw768uaq7IE7hKkrAzWetzu4g== dependencies: - "@budibase/backend-core" "1.0.184" + "@budibase/backend-core" "1.0.187" node-fetch "^2.6.1" "@cspotcode/source-map-consumer@0.8.0":