diff --git a/hosting/digitalocean/files/etc/update-motd.d/99-one-click b/hosting/digitalocean/files/etc/update-motd.d/99-one-click index 0f087a26ee..3fbdbe0146 100644 --- a/hosting/digitalocean/files/etc/update-motd.d/99-one-click +++ b/hosting/digitalocean/files/etc/update-motd.d/99-one-click @@ -12,7 +12,7 @@ All ports are BLOCKED except 22 (SSH), 80 (HTTP), 443 (HTTPS), and 10000 * Budibase website: http://budibase.com -For help and more information, visit https://docs.budibase.com/self-hosting/hosting-methods/digitalocean +For help and more information, visit https://docs.budibase.com/docs/digitalocean ******************************************************************************** To delete this message of the day: rm -rf $(readlink -f ${0}) diff --git a/i18n/README.de.md b/i18n/README.de.md index 34a9164c3f..a2f4c3afb9 100644 --- a/i18n/README.de.md +++ b/i18n/README.de.md @@ -39,7 +39,7 @@

- Los Geht's + Los Geht's · Dokumentation · @@ -109,7 +109,7 @@ $ budi hosting --start 4. Lege einen Admin-Benutzer an. Gib die E-Mail und das Passwort für den neuen Admin-Benutzer ein. -Schon geschafft! Jetzt kann es losgehen mit der minutenschnellen Entwicklung deiner Tools. Für weitere Informationen und Tipps schau doch mal in unsere [Dokumentation](https://docs.budibase.com/getting-started). +Schon geschafft! Jetzt kann es losgehen mit der minutenschnellen Entwicklung deiner Tools. Für weitere Informationen und Tipps schau doch mal in unsere [Dokumentation](https://docs.budibase.com/docs/quickstart-tutorials).
diff --git a/i18n/README.es.md b/i18n/README.es.md index e0a5259cbc..7245dc8656 100644 --- a/i18n/README.es.md +++ b/i18n/README.es.md @@ -112,7 +112,7 @@ The Budibase builder runs in Electron, on Mac, PC and Linux. Follow the steps be Budibase wants to make sure anyone can use the tools we develop and we know a lot of people need to be able to host the apps they make on their own systems - that is why we've decided to try and make self hosting as easy as possible! -Currently, you can host your apps using Docker or Digital Ocean. The documentation for self-hosting can be found [here](https://docs.budibase.com/self-hosting/introduction-to-self-hosting). +Currently, you can host your apps using Docker or Digital Ocean. The documentation for self-hosting can be found [here](https://docs.budibase.com/docs/hosting-methods). [![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/droplets/new?onboarding_origin=marketplace&i=09038e&fleetUuid=bb04f9c8-1de8-4687-b2ae-1d5177a0535b&appId=77729671&type=applications&size=s-4vcpu-8gb®ion=nyc1&refcode=0caaa6085a82&image=budibase-20-04) diff --git a/lerna.json b/lerna.json index 80d7963f04..f88467cf8e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.91-alpha.10", + "version": "1.0.91-alpha.12", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 6766ae6987..d1a2135048 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.91-alpha.10", + "version": "1.0.91-alpha.12", "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 06afdff505..3f2d6e8923 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.91-alpha.10", + "version": "1.0.91-alpha.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.0.91-alpha.10", + "@budibase/string-templates": "^1.0.91-alpha.12", "@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 5813335526..f6321dc351 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.91-alpha.10", + "version": "1.0.91-alpha.12", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.91-alpha.10", - "@budibase/client": "^1.0.91-alpha.10", - "@budibase/frontend-core": "^1.0.91-alpha.10", - "@budibase/string-templates": "^1.0.91-alpha.10", + "@budibase/bbui": "^1.0.91-alpha.12", + "@budibase/client": "^1.0.91-alpha.12", + "@budibase/frontend-core": "^1.0.91-alpha.12", + "@budibase/string-templates": "^1.0.91-alpha.12", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte index cc2512be8f..bceff0ef2e 100644 --- a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte +++ b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte @@ -56,7 +56,7 @@ Learn about automations diff --git a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte index d8bc7fca3b..59bf818b71 100644 --- a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte +++ b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte @@ -69,7 +69,7 @@ Learn about webhooks diff --git a/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte b/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte index b8c173818d..19cea6db65 100644 --- a/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte +++ b/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte @@ -40,7 +40,7 @@ Learn about webhooks diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte index 5c39273668..19c1165d9e 100644 --- a/packages/builder/src/components/integration/QueryViewer.svelte +++ b/packages/builder/src/components/integration/QueryViewer.svelte @@ -33,8 +33,7 @@ let parameters let data = [] let saveId - const transformerDocs = - "https://docs.budibase.com/building-apps/data/transformers" + const transformerDocs = "https://docs.budibase.com/docs/transformers" $: datasource = $datasources.list.find(ds => ds._id === query.datasourceId) $: query.schema = fieldsToSchema(fields) diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte index a0df3a9d07..17e35eda31 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte @@ -415,9 +415,7 @@ - window.open( - "https://docs.budibase.com/building-apps/data/transformers" - )} + window.open("https://docs.budibase.com/docs/transformers")} on:change={() => updateFlag("queryTransformerBanner", true)} > Add a JavaScript function to transform the query result. diff --git a/packages/cli/package.json b/packages/cli/package.json index 8598d8ef92..f285e5d4a9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.91-alpha.10", + "version": "1.0.91-alpha.12", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/cli/src/hosting/index.js b/packages/cli/src/hosting/index.js index 2b147810b4..2ebcee43a5 100644 --- a/packages/cli/src/hosting/index.js +++ b/packages/cli/src/hosting/index.js @@ -35,7 +35,7 @@ async function downloadFiles() { async function checkDockerConfigured() { const error = - "docker/docker-compose has not been installed, please follow instructions at: https://docs.budibase.com/self-hosting/hosting-methods/docker-compose#installing-docker" + "docker/docker-compose has not been installed, please follow instructions at: https://docs.budibase.com/docs/docker-compose" const docker = await lookpath("docker") const compose = await lookpath("docker-compose") if (!docker || !compose) { diff --git a/packages/client/package.json b/packages/client/package.json index bb95ec4912..941bd43926 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.91-alpha.10", + "version": "1.0.91-alpha.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.0.91-alpha.10", - "@budibase/frontend-core": "^1.0.91-alpha.10", - "@budibase/string-templates": "^1.0.91-alpha.10", + "@budibase/bbui": "^1.0.91-alpha.12", + "@budibase/frontend-core": "^1.0.91-alpha.12", + "@budibase/string-templates": "^1.0.91-alpha.12", "@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 e3eba8c9af..e90dd6b335 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.91-alpha.10", + "version": "1.0.91-alpha.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.0.91-alpha.10", + "@budibase/bbui": "^1.0.91-alpha.12", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 5884a6c516..82512df419 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.91-alpha.10", + "version": "1.0.91-alpha.12", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -71,9 +71,9 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.91-alpha.10", - "@budibase/client": "^1.0.91-alpha.10", - "@budibase/string-templates": "^1.0.91-alpha.10", + "@budibase/backend-core": "^1.0.91-alpha.12", + "@budibase/client": "^1.0.91-alpha.12", + "@budibase/string-templates": "^1.0.91-alpha.12", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", @@ -158,6 +158,7 @@ "copyfiles": "^2.4.1", "docker-compose": "^0.23.6", "eslint": "^6.8.0", + "is-wsl": "^2.2.0", "jest": "^27.0.5", "jest-openapi": "^0.14.2", "nodemon": "^2.0.4", diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js index 46a221ca33..03b53c8855 100644 --- a/packages/server/scripts/dev/manage.js +++ b/packages/server/scripts/dev/manage.js @@ -2,10 +2,11 @@ const compose = require("docker-compose") const path = require("path") const fs = require("fs") +const isWsl = require("is-wsl") const { processStringSync } = require("@budibase/string-templates") function isLinux() { - return process.platform !== "darwin" && process.platform !== "win32" + return !isWsl && process.platform !== "darwin" && process.platform !== "win32" } // This script wraps docker-compose allowing you to manage your dev infrastructure with simple commands. diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 8aa64db0c2..216c043c97 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -995,10 +995,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@^1.0.84": - version "1.0.84" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.84.tgz#9fb01669129838419c57f1723e9274cb4bb9dfd5" - integrity sha512-8hqRxSHO8A46f/hyzcqCdlku05yXBVEea1/FJdkoEDoCPhbuv04VHQ/f/dwkWctQ/oL8fm8MHpCA4ApyO7bnJA== +"@budibase/backend-core@^1.0.94": + version "1.0.94" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.94.tgz#3f5806198de28f376deec0b6c6c2d5dbf8ac78e0" + integrity sha512-XrxcpqyWZhkADRTNwj2InVUZ1rKkblrJtvB+Bbp4JesBapwKxyQ6gezA6GQ15KILwYxWIhQTBPDBYdi6JtWpXA== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -1068,13 +1068,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/bbui@^1.0.84": - version "1.0.84" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.0.84.tgz#8bf2f3d93aaf71ae353f93b10cb34e06c99d8176" - integrity sha512-GO2qXq5wJ00YCdgl93fP1y9eLwAbX0fpt9WVqNYWcgUzAMkeQAOPr7S0ud05GwLZPo736exxqh6RzSwo5H73sg== +"@budibase/bbui@^1.0.94": + version "1.0.94" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.0.94.tgz#f33e6d4001ddb69bcd5e6a305547b2b37e96030b" + integrity sha512-lv4k8QRrVHnI6i2uvqGUjUfiIXx3RDduaWqTbjP17vdRJn59StUTqvwevToyVQVmRl6qTpFGJtOzL1Vc7rjofA== dependencies: "@adobe/spectrum-css-workflow-icons" "^1.2.1" - "@budibase/string-templates" "^1.0.84" + "@budibase/string-templates" "^1.0.94" "@spectrum-css/actionbutton" "^1.0.1" "@spectrum-css/actiongroup" "^1.0.1" "@spectrum-css/avatar" "^3.0.2" @@ -1120,14 +1120,14 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/client@^1.0.84": - version "1.0.84" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-1.0.84.tgz#7d29cd03a3611fb580ced1bb911b45e73a8c7832" - integrity sha512-sZC3/7KQXPHS/jDyeTiPKK8Ri81JgtgInIfEvpd45V5jeg5kNo0L1m37xZgQEzQCqSqr47veM6WN7Kl3WYZr0g== +"@budibase/client@^1.0.94": + version "1.0.94" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-1.0.94.tgz#1c672bfb7f7b9da0f86cc840486286e91b8dbb29" + integrity sha512-vhifnPWaXLmfjvADgs8YWlXXnb+ZmKh/TYrpOrAdPDJ26SsicuBnfwvvuPrfgNwH6PXrJKYjqFrRtUwjJWiOEg== dependencies: - "@budibase/bbui" "^1.0.84" - "@budibase/frontend-core" "^1.0.84" - "@budibase/string-templates" "^1.0.84" + "@budibase/bbui" "^1.0.94" + "@budibase/frontend-core" "^1.0.94" + "@budibase/string-templates" "^1.0.94" "@spectrum-css/button" "^3.0.3" "@spectrum-css/card" "^3.0.3" "@spectrum-css/divider" "^1.0.3" @@ -1147,12 +1147,12 @@ svelte-flatpickr "^3.1.0" svelte-spa-router "^3.0.5" -"@budibase/frontend-core@^1.0.84": - version "1.0.84" - resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-1.0.84.tgz#d21594ddb521b79e2ac1b5322903887268f8a9aa" - integrity sha512-v6vTIVq8p+1ytnCWckYUqzzJ4Ylo6DF4C/pi2x5UrZxZuU7tQPMYGktHGQOouosHoGoZXsnPXJooeFHy43j0OQ== +"@budibase/frontend-core@^1.0.94": + version "1.0.94" + resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-1.0.94.tgz#3067f792fc4b12b41fcb1532c07328a29cee9e7d" + integrity sha512-I1dVKY2MCPpCVneQ0e7EfcPELlubPJjcw0MOJ5TIMDNgBynBv0kXbL9bXAz83a4oA08rTjTQ/Q6i4dS6I2rrqQ== dependencies: - "@budibase/bbui" "^1.0.84" + "@budibase/bbui" "^1.0.94" lodash "^4.17.21" svelte "^3.46.2" @@ -1199,10 +1199,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@^1.0.84": - version "1.0.84" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.0.84.tgz#66669e9898ed20c6be2c46a5eb19d55003eb6bcb" - integrity sha512-6Tv/TfGkmr3uBwNdZ3eKAPKwdsRTZbuQ+02puH+EcJK2leCerINo1SpAHf1BOmjQJynKeslKpSkUiisRVerMEg== +"@budibase/string-templates@^1.0.94": + version "1.0.94" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.0.94.tgz#1937bcfc457c1b0448c4b2311eb5787d6ab333f8" + integrity sha512-emthKtjcyZRYDWnA8h3XWv1R4FFIG73/OeDfj+ZLemViNVN+gxF843qvvh14iFhCifOR/tcghDwexPIa0zWXiw== dependencies: "@budibase/handlebars-helpers" "^0.11.8" dayjs "^1.10.4" diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 479d16f606..f6dc7c0238 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.91-alpha.10", + "version": "1.0.91-alpha.12", "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 7fb526641f..ff1ead08f9 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.91-alpha.10", + "version": "1.0.91-alpha.12", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,8 +34,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.91-alpha.10", - "@budibase/string-templates": "^1.0.91-alpha.10", + "@budibase/backend-core": "^1.0.91-alpha.12", + "@budibase/string-templates": "^1.0.91-alpha.12", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0",