Merge branch 'master' into BUDI-7580/account_portal_submodule

.gitignore

@@ -1,4 +1,3 @@
-builder/*
 .data/
 .temp/
 packages/server/runtime_apps/
@@ -41,8 +40,11 @@ bower_components
 build/Release
 
 # Dependency directories
-/node_modules/
 jspm_packages/
+*.min.js
+*.map
+node_modules/
+dist/
 
 # TypeScript v1 declaration files
 typings/

lerna.json

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

packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte

@@ -125,7 +125,6 @@
 
   // Handler for DatasourceModal confirmation, move to screen access select
   const confirmScreenDatasources = async ({ templates }) => {
-    console.log(templates)
     selectedTemplates = templates
     screenAccessRoleModal.show()
   }

packages/builder/src/pages/builder/portal/apps/index.svelte

@@ -1,6 +1,5 @@
 <script>
   import {
-    banner,
     Heading,
     Layout,
     Button,
@@ -11,7 +10,6 @@
     Notification,
     Body,
     Search,
-    BANNER_TYPES,
   } from "@budibase/bbui"
   import Spinner from "components/common/Spinner.svelte"
   import CreateAppModal from "components/start/CreateAppModal.svelte"
@@ -200,20 +198,6 @@
       if (usersLimitLockAction) {
         usersLimitLockAction()
       }
-      if (!$admin.isDev) {
-        await banner.show({
-          messages: [
-            {
-              message:
-                "We've updated our pricing - see our website to learn more.",
-              type: BANNER_TYPES.NEUTRAL,
-              extraButtonText: "Learn More",
-              extraButtonAction: () =>
-                window.open("https://budibase.com/pricing"),
-            },
-          ],
-        })
-      }
     } catch (error) {
       notifications.error("Error getting init info")
     }