Merge pull request #4603 from Budibase/merge-master

Merge master -> develop

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.72-alpha.0",
+  "version": "1.0.72",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

package.json

@@ -50,7 +50,7 @@
     "build:docker:proxy:preprod": "lerna run generate:proxy:preprod && npm run build:docker:proxy",
     "build:docker:proxy:prod": "lerna run generate:proxy:prod && npm run build:docker:proxy",
     "build:docker:selfhost": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh latest && cd -",
-    "build:docker:develop": "node scripts/pinVersions && lerna run build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -",
+    "build:docker:develop": "node scripts/pinVersions && lerna run build:docker && npm run build:docker:proxy:compose && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -",
     "build:docker:airgap": "node hosting/scripts/airgapped/airgappedDockerBuild",
     "build:digitalocean": "cd hosting/digitalocean && ./build.sh && cd -",
     "build:docs": "lerna run build:docs",

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.72-alpha.0",
+  "version": "1.0.72",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.72-alpha.0",
+  "version": "1.0.72",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.72-alpha.0",
+  "version": "1.0.72",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -64,10 +64,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.72-alpha.0",
-    "@budibase/client": "^1.0.72-alpha.0",
-    "@budibase/frontend-core": "^1.0.72-alpha.0",
-    "@budibase/string-templates": "^1.0.72-alpha.0",
+    "@budibase/bbui": "^1.0.72",
+    "@budibase/client": "^1.0.72",
+    "@budibase/frontend-core": "^1.0.72",
+    "@budibase/string-templates": "^1.0.72",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.72-alpha.0",
+  "version": "1.0.72",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.72-alpha.0",
+  "version": "1.0.72",
   "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.72-alpha.0",
-    "@budibase/frontend-core": "^1.0.72-alpha.0",
-    "@budibase/string-templates": "^1.0.72-alpha.0",
+    "@budibase/bbui": "^1.0.72",
+    "@budibase/frontend-core": "^1.0.72",
+    "@budibase/string-templates": "^1.0.72",
     "regexparam": "^1.3.0",
     "rollup-plugin-polyfill-node": "^0.8.0",
     "shortid": "^2.2.15",

packages/frontend-core/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.72-alpha.0",
+  "version": "1.0.72",
   "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.72-alpha.0",
+    "@budibase/bbui": "^1.0.72",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.72-alpha.0",
+  "version": "1.0.72",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -73,9 +73,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.72-alpha.0",
-    "@budibase/client": "^1.0.72-alpha.0",
-    "@budibase/string-templates": "^1.0.72-alpha.0",
+    "@budibase/backend-core": "^1.0.72",
+    "@budibase/client": "^1.0.72",
+    "@budibase/string-templates": "^1.0.72",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.72-alpha.0",
+  "version": "1.0.72",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.72-alpha.0",
+  "version": "1.0.72",
   "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.72-alpha.0",
-    "@budibase/string-templates": "^1.0.72-alpha.0",
+    "@budibase/backend-core": "^1.0.72",
+    "@budibase/string-templates": "^1.0.72",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",