merge from master

5 years ago · e2ed2e8b56
16 changed files with 112 additions and 57 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -53,7 +53,7 @@ jobs:
        uses: "WyriHaximus/github-action-get-previous-tag@v1"

      - name: Build/release Docker images
-        if: ${{ github.event.inputs.release_self_host == 'N' }}
+        if: ${{ github.event.inputs.release_self_host != 'Y' }}
        run: | 
          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
          yarn build
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "0.9.125-alpha.20",
+  "version": "0.9.139",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/auth",
-  "version": "0.9.125-alpha.20",
+  "version": "0.9.139",
  "description": "Authentication middlewares for budibase builder and apps",
  "main": "src/index.js",
  "author": "Budibase",
--- a/packages/auth/src/environment.js
+++ b/packages/auth/src/environment.js
@ -16,6 +16,7 @@ module.exports = {
  REDIS_PASSWORD: process.env.REDIS_PASSWORD,
  MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
  MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
+  AWS_REGION: process.env.AWS_REGION,
  MINIO_URL: process.env.MINIO_URL,
  INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
  MULTI_TENANCY: process.env.MULTI_TENANCY,
--- a/packages/auth/src/objectStore/index.js
+++ b/packages/auth/src/objectStore/index.js
@ -73,6 +73,7 @@ exports.ObjectStore = bucket => {
  AWS.config.update({
    accessKeyId: env.MINIO_ACCESS_KEY,
    secretAccessKey: env.MINIO_SECRET_KEY,
+    region: env.AWS_REGION,
  })
  const config = {
    s3ForcePathStyle: true,
--- 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.125-alpha.20",
+  "version": "0.9.139",
  "license": "AGPL-3.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "0.9.125-alpha.20",
+  "version": "0.9.139",
  "license": "AGPL-3.0",
  "private": true,
  "scripts": {
@ -65,10 +65,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.125-alpha.20",
-    "@budibase/client": "^0.9.125-alpha.20",
+    "@budibase/bbui": "^0.9.139",
+    "@budibase/client": "^0.9.139",
    "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.125-alpha.20",
+    "@budibase/string-templates": "^0.9.139",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "0.9.125-alpha.20",
+  "version": "0.9.139",
  "description": "Budibase CLI, for developers, self hosting and migrations.",
  "main": "src/index.js",
  "bin": {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "0.9.125-alpha.20",
+  "version": "0.9.139",
  "license": "MPL-2.0",
  "module": "dist/budibase-client.js",
  "main": "dist/budibase-client.js",
@ -19,8 +19,9 @@
    "dev:builder": "rollup -cw"
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.125-alpha.20",
-    "@budibase/string-templates": "^0.9.125-alpha.20",
+    "@budibase/bbui": "^0.9.139",
+    "@budibase/standard-components": "^0.9.139",
+    "@budibase/string-templates": "^0.9.139",
    "regexparam": "^1.3.0",
    "shortid": "^2.2.15",
    "svelte-spa-router": "^3.0.5"
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "0.9.125-alpha.20",
+  "version": "0.9.139",
  "description": "Budibase Web Server",
  "main": "src/index.js",
  "repository": {
@ -64,9 +64,9 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.125-alpha.20",
-    "@budibase/client": "^0.9.125-alpha.20",
-    "@budibase/string-templates": "^0.9.125-alpha.20",
+    "@budibase/auth": "^0.9.139",
+    "@budibase/client": "^0.9.139",
+    "@budibase/string-templates": "^0.9.139",
    "@elastic/elasticsearch": "7.10.0",
    "@koa/router": "8.0.0",
    "@sendgrid/mail": "7.1.1",
@ -118,6 +118,7 @@
  "devDependencies": {
    "@babel/core": "^7.14.3",
    "@babel/preset-env": "^7.14.4",
+    "@budibase/standard-components": "^0.9.139",
    "@jest/test-sequencer": "^24.8.0",
    "@types/bull": "^3.15.1",
    "@types/jest": "^26.0.23",
--- a/packages/server/src/utilities/fileSystem/index.js
+++ b/packages/server/src/utilities/fileSystem/index.js
@ -124,11 +124,13 @@ exports.performBackup = async (appId, backupName) => {
      ),
  })
  // write the file to the object store
-  await streamUpload(
-    ObjectStoreBuckets.BACKUPS,
-    join(appId, backupName),
-    fs.createReadStream(path)
-  )
+  if (env.SELF_HOSTED) {
+    await streamUpload(
+      ObjectStoreBuckets.BACKUPS,
+      join(appId, backupName),
+      fs.createReadStream(path)
+    )
+  }
  return fs.createReadStream(path)
 }

--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@ -943,10 +943,10 @@
  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

-"@budibase/auth@^0.9.125-alpha.17":
-  version "0.9.133"
-  resolved "https://registry.yarnpkg.com/@budibase/auth/-/auth-0.9.133.tgz#280d581820c9069b6bc021f88178c215ee48ad08"
-  integrity sha512-DL7zIYRXE6xSKE/qbHMf/SX3+bceGxM4xzUmLTk4OHtEOP/vaUJr35tkhznAZF7VpUR9Yh20D6/Zw8z/3sxj/A==
+"@budibase/auth@^0.9.134":
+  version "0.9.134"
+  resolved "https://registry.yarnpkg.com/@budibase/auth/-/auth-0.9.134.tgz#2cc5aed3b5215d4975039e58499f6de07d78a823"
+  integrity sha512-GkeTGXReap928KDTc1biVQlMMSF7kHHc9ErWFDk0unONJHVV5KJl21t+RbT7wQaHI1XMhdatQvYaFJgkfclTQQ==
  dependencies:
    "@techpass/passport-openidconnect" "^0.3.0"
    aws-sdk "^2.901.0"
@ -966,10 +966,10 @@
    uuid "^8.3.2"
    zlib "^1.0.5"

-"@budibase/bbui@^0.9.133":
-  version "0.9.133"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.133.tgz#91a2fb24abaaf91d2cb1e00eb51c493c1290f9ad"
-  integrity sha512-xbMmc/hee1QRNW7TrbGUBmLr1hMHXqUDA6rdl9N2PGfHFuFWbqlD8PWYanHmLevVet+CjkuKGPSbBghFK2pQyQ==
+"@budibase/bbui@^0.9.134":
+  version "0.9.134"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.134.tgz#e82a364a4b7fdf5f8cd931d61eb3ed6972709fd9"
+  integrity sha512-zcLMz1GajVHY3YZ+f8tPmiAFcnKWmK93g0YENg4y+0URzBx6zPSccCP3gy+jzF/z7SOEY7XgaNPGs+zPzLGZ5w==
  dependencies:
    "@adobe/spectrum-css-workflow-icons" "^1.2.1"
    "@spectrum-css/actionbutton" "^1.0.1"
@ -1015,14 +1015,14 @@
    svelte-flatpickr "^3.1.0"
    svelte-portal "^1.0.0"

-"@budibase/client@^0.9.125-alpha.17":
-  version "0.9.133"
-  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.9.133.tgz#43748e189e9b92d99d1281ab62bd2c5ebed5dbab"
-  integrity sha512-JrduL9iVMGalZyIUQ+1UN/dhrOZNRJwXU8B4r/eWhVoJf3f3bCuNfpMoT2LN3HY4ooyu37VehD+J5bdDsvlNPw==
+"@budibase/client@^0.9.134":
+  version "0.9.134"
+  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.9.134.tgz#4667bf623fa07879d32149d1a9d26ccc30cb5ab6"
+  integrity sha512-xor7IYtzTm53it/kvRBxAmMaEWPspchOdFi7yDSN9/QIZULFp/Z0FLg3RoSaaHrDIvKDUXOg8ylZyoNbxm34+g==
  dependencies:
-    "@budibase/bbui" "^0.9.133"
-    "@budibase/standard-components" "^0.9.133"
-    "@budibase/string-templates" "^0.9.133"
+    "@budibase/bbui" "^0.9.134"
+    "@budibase/standard-components" "^0.9.134"
+    "@budibase/string-templates" "^0.9.134"
    regexparam "^1.3.0"
    shortid "^2.2.15"
    svelte-spa-router "^3.0.5"
@ -1055,12 +1055,12 @@
    to-gfm-code-block "^0.1.1"
    year "^0.2.1"

-"@budibase/standard-components@^0.9.133":
-  version "0.9.133"
-  resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.133.tgz#789c02b45dc3853b003822c09e18ce7ece4dfa29"
-  integrity sha512-xcuwTxsqk1J/YmM4YjThO/Fm0eJ+aZWm0kbFgfN+dNN9fuPlsPOLmlVEWeOUPmBa5XfRyDbx6lDYj0PPEK8CvA==
+"@budibase/standard-components@^0.9.134":
+  version "0.9.134"
+  resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.134.tgz#9038d2c45906a54d60efbac72fea475c23380017"
+  integrity sha512-3F8Mz4TpDZrKRprMoSDPDVB58WqlIHUoO7OQUdUcu9JR+jLOtMYmkQtFD4PfSNOYCy1rwQO7HLY2myjP5ltR1w==
  dependencies:
-    "@budibase/bbui" "^0.9.133"
+    "@budibase/bbui" "^0.9.134"
    "@spectrum-css/button" "^3.0.3"
    "@spectrum-css/card" "^3.0.3"
    "@spectrum-css/divider" "^1.0.3"
@ -1073,10 +1073,10 @@
    svelte-apexcharts "^1.0.2"
    svelte-flatpickr "^3.1.0"

-"@budibase/string-templates@^0.9.125-alpha.17", "@budibase/string-templates@^0.9.133":
-  version "0.9.133"
-  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.133.tgz#221d81e080dc4485dcffa989d16e2bbed39f9055"
-  integrity sha512-SMHcSPwHYdAqol9YCcMoYawp5/ETr9TqGZCUsL+hUUq+LritPwu/miQ++SVvRTQbOR7Mker0S9LO3H8mwYkW8w==
+"@budibase/string-templates@^0.9.134":
+  version "0.9.134"
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.134.tgz#089db910723d041f9fad27aef0ddb2e811134ee2"
+  integrity sha512-10syMncBtdXTJwJeatpvsxjCpKBv+0y+dr/3fjvKYkckY1j+ADQfj7jtzlZGdGb7PNZ554vOcjLb/cMkkhechg==
  dependencies:
    "@budibase/handlebars-helpers" "^0.11.4"
    dayjs "^1.10.4"
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@ -0,0 +1,49 @@
+{
+  "name": "@budibase/standard-components",
+  "module": "dist/standard-components.es.js",
+  "main": "dist/standard-components.es.js",
+  "svelte": "src/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/standard-components.es.js",
+      "require": "./dist/standard-components.es.js"
+    },
+    "./package.json": "./package.json",
+    "./manifest.json": "./manifest.json"
+  },
+  "scripts": {
+    "build": "vite build",
+    "prepublishOnly": "yarn run build",
+    "postpublish": "node scripts/deploy.js"
+  },
+  "files": [
+    "manifest.json",
+    "package.json",
+    "dist"
+  ],
+  "devDependencies": {
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.5",
+    "svelte": "^3.38.2",
+    "vite": "^2.1.5"
+  },
+  "keywords": [
+    "svelte"
+  ],
+  "version": "0.9.139",
+  "license": "MIT",
+  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
+  "dependencies": {
+    "@budibase/bbui": "^0.9.139",
+    "@spectrum-css/button": "^3.0.3",
+    "@spectrum-css/card": "^3.0.3",
+    "@spectrum-css/divider": "^1.0.3",
+    "@spectrum-css/link": "^3.1.3",
+    "@spectrum-css/page": "^3.0.1",
+    "@spectrum-css/typography": "^3.0.2",
+    "@spectrum-css/vars": "^3.0.1",
+    "apexcharts": "^3.22.1",
+    "dayjs": "^1.10.5",
+    "svelte-apexcharts": "^1.0.2",
+    "svelte-flatpickr": "^3.1.0"
+  }
+}
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "0.9.125-alpha.20",
+  "version": "0.9.139",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "0.9.125-alpha.20",
+  "version": "0.9.139",
  "description": "Budibase background service",
  "main": "src/index.js",
  "repository": {
@ -25,8 +25,8 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.125-alpha.20",
-    "@budibase/string-templates": "^0.9.125-alpha.20",
+    "@budibase/auth": "^0.9.139",
+    "@budibase/string-templates": "^0.9.139",
    "@koa/router": "^8.0.0",
    "@techpass/passport-openidconnect": "^0.3.0",
    "aws-sdk": "^2.811.0",
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@ -287,10 +287,10 @@
  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

-"@budibase/auth@^0.9.128":
-  version "0.9.128"
-  resolved "https://registry.yarnpkg.com/@budibase/auth/-/auth-0.9.128.tgz#6bb6c716b6647b7e9362e3faf12b191650ea0ad4"
-  integrity sha512-WCcrtAXilT/4++7PdzyTYgrdVqZcKhUev3NcGrFQf7WbDhkVCuigWbb8Q01KXODjbs0BZC0RshVv/PxrgLbBQA==
+"@budibase/auth@^0.9.134":
+  version "0.9.134"
+  resolved "https://registry.yarnpkg.com/@budibase/auth/-/auth-0.9.134.tgz#2cc5aed3b5215d4975039e58499f6de07d78a823"
+  integrity sha512-GkeTGXReap928KDTc1biVQlMMSF7kHHc9ErWFDk0unONJHVV5KJl21t+RbT7wQaHI1XMhdatQvYaFJgkfclTQQ==
  dependencies:
    "@techpass/passport-openidconnect" "^0.3.0"
    aws-sdk "^2.901.0"
@ -338,10 +338,10 @@
    to-gfm-code-block "^0.1.1"
    year "^0.2.1"

-"@budibase/string-templates@^0.9.128":
-  version "0.9.128"
-  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.128.tgz#50ee46dc0d726d481bd5139cd0b38364649a8463"
-  integrity sha512-4TzmnX2o5S2cts08ukB86El4wYm7cHuV2t6a7yDMGPe1mWeKP1WEtVF6rKhXEdbPTiotW8oYondOlgOP7DT9lA==
+"@budibase/string-templates@^0.9.134":
+  version "0.9.134"
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.134.tgz#089db910723d041f9fad27aef0ddb2e811134ee2"
+  integrity sha512-10syMncBtdXTJwJeatpvsxjCpKBv+0y+dr/3fjvKYkckY1j+ADQfj7jtzlZGdGb7PNZ554vOcjLb/cMkkhechg==
  dependencies:
    "@budibase/handlebars-helpers" "^0.11.4"
    dayjs "^1.10.4"