Merge branch 'chore/yarn_workspaces' into chore/pro_as_submodule

charts/budibase/templates/app-service-deployment.yaml

@@ -199,12 +199,7 @@ spec:
           value: {{ .Values.services.tlsRejectUnauthorized }}
         {{ end }}
 
-        image: >-
-          {{- if .Values.globals.appVersion }}
-          budibase/apps:{{ .Values.globals.appVersion }}
-          {{- else }}
-          budibase/apps:{{ .Chart.AppVersion }}
-          {{- end }}
+        image: budibase/apps:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

charts/budibase/templates/proxy-service-deployment.yaml

@@ -37,12 +37,7 @@ spec:
 {{ end }}
     spec:
       containers:
-        image: >-
-          {{- if .Values.globals.appVersion }}
-          budibase/proxy:{{ .Values.globals.appVersion }}
-          {{- else }}
-          budibase/proxy:{{ .Chart.AppVersion }}
-          {{- end }}
+      - image: budibase/proxy:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
         imagePullPolicy: Always
         name: proxy-service
         ports:

charts/budibase/templates/worker-service-deployment.yaml

@@ -188,12 +188,7 @@ spec:
         - name: NODE_TLS_REJECT_UNAUTHORIZED
           value: {{ .Values.services.tlsRejectUnauthorized }}
         {{ end }}
-        image: >-
-          {{- if .Values.globals.appVersion }}
-          budibase/worker:{{ .Values.globals.appVersion }}
-          {{- else }}
-          budibase/worker:{{ .Chart.AppVersion }}
-          {{- end }}
+        image: budibase/worker:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.4.44-alpha.17",
+  "version": "2.4.44-alpha.19",
   "npmClient": "yarn",
   "packages": [
     "packages/backend-core",

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.44-alpha.17",
+  "version": "2.4.44-alpha.19",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -22,7 +22,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.4.44-alpha.17",
+    "@budibase/types": "2.4.44-alpha.19",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.4.44-alpha.17",
+  "version": "2.4.44-alpha.19",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "2.4.44-alpha.17",
-    "@budibase/string-templates": "2.4.44-alpha.17",
+    "@budibase/shared-core": "2.4.44-alpha.19",
+    "@budibase/string-templates": "2.4.44-alpha.19",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.44-alpha.17",
+  "version": "2.4.44-alpha.19",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,11 +58,11 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.44-alpha.17",
-    "@budibase/client": "2.4.44-alpha.17",
-    "@budibase/frontend-core": "2.4.44-alpha.17",
-    "@budibase/shared-core": "2.4.44-alpha.17",
-    "@budibase/string-templates": "2.4.44-alpha.17",
+    "@budibase/bbui": "2.4.44-alpha.19",
+    "@budibase/client": "2.4.44-alpha.19",
+    "@budibase/frontend-core": "2.4.44-alpha.19",
+    "@budibase/shared-core": "2.4.44-alpha.19",
+    "@budibase/string-templates": "2.4.44-alpha.19",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.44-alpha.17",
+  "version": "2.4.44-alpha.19",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.4.44-alpha.17",
-    "@budibase/string-templates": "2.4.44-alpha.17",
-    "@budibase/types": "2.4.44-alpha.17",
+    "@budibase/backend-core": "2.4.44-alpha.19",
+    "@budibase/string-templates": "2.4.44-alpha.19",
+    "@budibase/types": "2.4.44-alpha.19",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.44-alpha.17",
+  "version": "2.4.44-alpha.19",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.44-alpha.17",
-    "@budibase/frontend-core": "2.4.44-alpha.17",
-    "@budibase/shared-core": "2.4.44-alpha.17",
-    "@budibase/string-templates": "2.4.44-alpha.17",
-    "@budibase/types": "2.4.44-alpha.17",
+    "@budibase/bbui": "2.4.44-alpha.19",
+    "@budibase/frontend-core": "2.4.44-alpha.19",
+    "@budibase/shared-core": "2.4.44-alpha.19",
+    "@budibase/string-templates": "2.4.44-alpha.19",
+    "@budibase/types": "2.4.44-alpha.19",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",

packages/frontend-core/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.44-alpha.17",
+  "version": "2.4.44-alpha.19",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.4.44-alpha.17",
-    "@budibase/shared-core": "2.4.44-alpha.17",
+    "@budibase/bbui": "2.4.44-alpha.19",
+    "@budibase/shared-core": "2.4.44-alpha.19",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.44-alpha.17",
+  "version": "2.4.44-alpha.19",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.4.44-alpha.17",
+  "version": "2.4.44-alpha.19",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.4.44-alpha.17",
-    "@budibase/client": "2.4.44-alpha.17",
-    "@budibase/pro": "2.4.44-alpha.17",
-    "@budibase/shared-core": "2.4.44-alpha.17",
-    "@budibase/string-templates": "2.4.44-alpha.17",
-    "@budibase/types": "2.4.44-alpha.17",
+    "@budibase/backend-core": "2.4.44-alpha.19",
+    "@budibase/client": "2.4.44-alpha.19",
+    "@budibase/pro": "2.4.44-alpha.19",
+    "@budibase/shared-core": "2.4.44-alpha.19",
+    "@budibase/string-templates": "2.4.44-alpha.19",
+    "@budibase/types": "2.4.44-alpha.19",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -115,7 +115,7 @@
     "to-json-schema": "0.2.5",
     "uuid": "3.3.2",
     "validate.js": "0.13.1",
-    "vm2": "3.9.11",
+    "vm2": "3.9.16",
     "worker-farm": "1.7.0",
     "xml2js": "0.4.23",
     "yargs": "13.2.4",

packages/shared-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.4.44-alpha.17",
+  "version": "2.4.44-alpha.19",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "2.4.44-alpha.17"
+    "@budibase/types": "2.4.44-alpha.19"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",

packages/string-templates/package.json

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

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.44-alpha.17",
+  "version": "2.4.44-alpha.19",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.4.44-alpha.17",
+  "version": "2.4.44-alpha.19",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.4.44-alpha.17",
-    "@budibase/pro": "2.4.44-alpha.17",
-    "@budibase/string-templates": "2.4.44-alpha.17",
-    "@budibase/types": "2.4.44-alpha.17",
+    "@budibase/backend-core": "2.4.44-alpha.19",
+    "@budibase/pro": "2.4.44-alpha.19",
+    "@budibase/string-templates": "2.4.44-alpha.19",
+    "@budibase/types": "2.4.44-alpha.19",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",