Merge branch 'master' of github.com:Budibase/budibase into url-context

.github/workflows/budibase_ci.yml

@@ -6,9 +6,11 @@ on:
  push:
     branches:
       - master
+      - develop 
  pull_request:
     branches:
       - master
+      - develop 
 
 jobs:
   build:

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.7.6",
+  "version": "0.7.7",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.58.4",
-    "@budibase/client": "^0.7.6",
+    "@budibase/client": "^0.7.7",
     "@budibase/colorpicker": "1.0.1",
-    "@budibase/string-templates": "^0.7.6",
+    "@budibase/string-templates": "^0.7.7",
     "@budibase/svelte-ag-grid": "^0.0.16",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "0.7.0",

packages/builder/src/pages/index.svelte

@@ -48,6 +48,11 @@
     modal.show()
   }
 
+  function closeModal() {
+    template = null
+    modal.hide()
+  }
+
   checkIfKeysAndApps()
 </script>
 
@@ -73,7 +78,7 @@
   <AppList />
 </div>
 
-<Modal bind:this={modal} padding={false} width="600px">
+<Modal bind:this={modal} padding={false} width="600px" on:hide={closeModal}>
   <CreateAppModal {hasKey} {template} />
 </Modal>
 

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,14 +9,14 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.7.6",
+    "@budibase/string-templates": "^0.7.7",
     "deep-equal": "^2.0.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.7.6",
+    "@budibase/standard-components": "^0.7.7",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -50,8 +50,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.7.6",
-    "@budibase/string-templates": "^0.7.6",
+    "@budibase/client": "^0.7.7",
+    "@budibase/string-templates": "^0.7.7",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",

packages/server/src/utilities/builder/hosting.js

@@ -94,6 +94,7 @@ exports.getDeployedApps = async () => {
   }
   const workerUrl = !env.CLOUD ? await exports.getWorkerUrl() : env.WORKER_URL
   const hostingKey = !env.CLOUD ? hostingInfo.selfHostKey : env.HOSTING_KEY
+  try {
     const response = await fetch(`${workerUrl}/api/apps`, {
       method: "GET",
       headers: {
@@ -107,4 +108,8 @@ exports.getDeployedApps = async () => {
       }
     }
     return json
+  } catch (err) {
+    // error, cannot determine deployed apps, don't stop app creation - sort this later
+    return {}
+  }
 }

packages/standard-components/package.json

@@ -35,7 +35,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.7.6",
+  "version": "0.7.7",
   "license": "MIT",
   "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd",
   "dependencies": {

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.js",
   "module": "src/index.js",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {