Merge branch 'master' into revert-13160-revert-13128-feature/sql-query-aliasing

packages/builder/src/components/design/settings/controls/IconSelect/IconSelect.svelte

@@ -116,7 +116,6 @@
   $: pagerText = `Page ${currentPage} of ${totalPages}`
 </script>
 
-a11y-click-events-have-key-events
 <div bind:this={buttonAnchor}>
   <ActionButton on:click={dropdown.show}>
     {displayValue}

packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte

@@ -12,11 +12,17 @@
     hoverStore,
   } from "stores/builder"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { Layout, Heading, Body, Icon, notifications } from "@budibase/bbui"
+  import {
+    ProgressCircle,
+    Layout,
+    Heading,
+    Body,
+    Icon,
+    notifications,
+  } from "@budibase/bbui"
   import ErrorSVG from "@budibase/frontend-core/assets/error.svg?raw"
   import { findComponent, findComponentPath } from "helpers/components"
   import { isActive, goto } from "@roxi/routify"
-  import { ClientAppSkeleton } from "@budibase/frontend-core"
 
   let iframe
   let layout
@@ -234,16 +240,8 @@
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <div class="component-container">
   {#if loading}
-    <div
+    <div class="center">
-      class={`loading ${$builderStore.theme}`}
+      <ProgressCircle />
-      class:tablet={$previewStore.previewDevice === "tablet"}
-      class:mobile={$previewStore.previewDevice === "mobile"}
-    >
-      <ClientAppSkeleton
-        sideNav={$builderStore.navigation?.navigation === "Left"}
-        hideFooter
-        hideDevTools
-      />
     </div>
   {:else if error}
     <div class="center error">
@@ -260,6 +258,8 @@
     bind:this={iframe}
     src="/app/preview"
     class:hidden={loading || error}
+    class:tablet={$previewStore.previewDevice === "tablet"}
+    class:mobile={$previewStore.previewDevice === "mobile"}
   />
   <div
     class="add-component"
@@ -279,25 +279,6 @@
 />
 
 <style>
-  .loading {
-    position: absolute;
-    container-type: inline-size;
-    width: 100%;
-    height: 100%;
-    border: 2px solid transparent;
-    box-sizing: border-box;
-  }
-
-  .loading.tablet {
-    width: calc(1024px + 6px);
-    max-height: calc(768px + 6px);
-  }
-
-  .loading.mobile {
-    width: calc(390px + 6px);
-    max-height: calc(844px + 6px);
-  }
-
   .component-container {
     grid-row-start: middle;
     grid-column-start: middle;

packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte

@@ -1,22 +1,16 @@
 <script>
-  import { onMount, onDestroy } from "svelte"
   import { params, goto } from "@roxi/routify"
-  import { licensing, apps, auth, sideBarCollapsed } from "stores/portal"
+  import { apps, auth, sideBarCollapsed } from "stores/portal"
   import { Link, Body, ActionButton } from "@budibase/bbui"
   import { sdk } from "@budibase/shared-core"
   import { API } from "api"
   import ErrorSVG from "./ErrorSVG.svelte"
-  import { ClientAppSkeleton } from "@budibase/frontend-core"
 
   $: app = $apps.find(app => app.appId === $params.appId)
   $: iframeUrl = getIframeURL(app)
   $: isBuilder = sdk.users.isBuilder($auth.user, app?.devId)
 
-  let loading = true
-
   const getIframeURL = app => {
-    loading = true
-
     if (app.status === "published") {
       return `/app${app.url}`
     }
@@ -34,20 +28,6 @@
   }
 
   $: fetchScreens(app?.devId)
-
-  const receiveMessage = async message => {
-    if (message.data.type === "docLoaded") {
-      loading = false
-    }
-  }
-
-  onMount(() => {
-    window.addEventListener("message", receiveMessage)
-  })
-
-  onDestroy(() => {
-    window.removeEventListener("message", receiveMessage)
-  })
 </script>
 
 <div class="container">
@@ -98,17 +78,7 @@
       </Body>
     </div>
   {:else}
-    <div class:hide={!loading} class="loading">
+    <iframe src={iframeUrl} title={app.name} />
-      <div class={`loadingThemeWrapper ${app.theme}`}>
-        <ClientAppSkeleton
-          noAnimation
-          hideDevTools={app?.status === "published"}
-          sideNav={app?.navigation.navigation === "Left"}
-          hideFooter={$licensing.brandingEnabled}
-        />
-      </div>
-    </div>
-    <iframe class:hide={loading} src={iframeUrl} title={app.name} />
   {/if}
 </div>
 
@@ -130,23 +100,6 @@
     flex: 0 0 50px;
   }
 
-  .loading {
-    height: 100%;
-    border: 1px solid var(--spectrum-global-color-gray-300);
-    border-radius: var(--spacing-s);
-    overflow: hidden;
-  }
-  .loadingThemeWrapper {
-    height: 100%;
-    container-type: inline-size;
-  }
-
-  .hide {
-    visibility: hidden;
-    height: 0;
-    border: none;
-  }
-
   iframe {
     flex: 1 1 auto;
     border-radius: var(--spacing-s);

packages/client/src/components/ClientApp.svelte

@@ -80,18 +80,11 @@
     }
   }
 
-  let fontsLoaded = false
-
   // Load app config
   onMount(async () => {
-    document.fonts.ready.then(() => {
-      fontsLoaded = true
-    })
-
     await initialise()
     await authStore.actions.fetchUser()
     dataLoaded = true
-
     if (get(builderStore).inBuilder) {
       builderStore.actions.notifyLoaded()
     } else {
@@ -100,12 +93,6 @@
       })
     }
   })
-
-  $: {
-    if (dataLoaded && fontsLoaded) {
-      document.getElementById("clientAppSkeletonLoader")?.remove()
-    }
-  }
 </script>
 
 <svelte:head>
@@ -116,13 +103,13 @@
   {/if}
 </svelte:head>
 
+{#if dataLoaded}
   <div
     id="spectrum-root"
     lang="en"
     dir="ltr"
     class="spectrum spectrum--medium {$themeStore.baseTheme} {$themeStore.theme}"
     class:builder={$builderStore.inBuilder}
-  class:show={fontsLoaded && dataLoaded}
   >
     <DeviceBindingsProvider>
       <UserBindingsProvider>
@@ -242,14 +229,14 @@
     </DeviceBindingsProvider>
   </div>
   <KeyboardManager />
+{/if}
 
 <style>
   #spectrum-root {
-    height: 0;
-    visibility: hidden;
     padding: 0;
     margin: 0;
     overflow: hidden;
+    height: 100%;
     width: 100%;
     display: flex;
     flex-direction: row;
@@ -270,11 +257,6 @@
     background-color: transparent;
   }
 
-  #spectrum-root.show {
-    height: 100%;
-    visibility: visible;
-  }
-
   #app-root {
     overflow: hidden;
     height: 100%;

packages/client/src/components/FreeFooter.svelte

@@ -13,7 +13,6 @@
 
 <style>
   .free-footer {
-    min-height: 51px;
     flex: 0 0 auto;
     padding: 16px 20px;
     border-top: 1px solid var(--spectrum-global-color-gray-300);

packages/frontend-core/src/components/ClientAppSkeleton.svelte

@@ -1,244 +0,0 @@
-<script>
-  export let sideNav = false
-  export let hideDevTools = false
-  export let hideFooter = false
-  export let noAnimation = false
-</script>
-
-<div class:sideNav id="clientAppSkeletonLoader" class="skeleton">
-  <div class="animation" class:noAnimation />
-
-  {#if !hideDevTools}
-    <div class="devTools" />
-  {/if}
-  <div class="main">
-    <div class="nav" />
-    <div class="body">
-      <div class="bodyVerticalPadding" />
-      <div class="bodyHorizontal">
-        <div class="bodyHorizontalPadding" />
-        <svg
-          class="svg"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="240"
-          height="256"
-        >
-          <mask id="mask">
-            <rect x="0" y="0" width="240" height="256" fill="white" />
-            <rect x="0" y="0" width="240" height="32" rx="6" fill="black" />
-            <rect x="0" y="56" width="240" height="32" rx="6" fill="black" />
-            <rect x="0" y="112" width="240" height="32" rx="6" fill="black" />
-            <rect x="0" y="168" width="240" height="32" rx="6" fill="black" />
-            <rect x="71" y="224" width="98" height="32" rx="6" fill="black" />
-          </mask>
-
-          <rect
-            x="0"
-            y="0"
-            width="240"
-            height="256"
-            fill="black"
-            mask="url(#mask)"
-          />
-        </svg>
-        <div class="bodyHorizontalPadding" />
-      </div>
-      <div class="bodyVerticalPadding" />
-    </div>
-  </div>
-  {#if !hideFooter}
-    <div class="footer" />
-  {/if}
-</div>
-
-<style>
-  .skeleton {
-    position: relative;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    border-radius: 4px;
-    overflow: hidden;
-    background-color: var(--spectrum-global-color-gray-200);
-  }
-
-  .animation {
-    position: absolute;
-    height: 100%;
-    width: 100%;
-    background: linear-gradient(
-      to right,
-      transparent 0%,
-      var(--spectrum-global-color-gray-300) 20%,
-      transparent 40%,
-      transparent 100%
-    );
-    animation-duration: 1.3s;
-    animation-fill-mode: forwards;
-    animation-iteration-count: infinite;
-    animation-name: shimmer;
-    animation-timing-function: linear;
-  }
-
-  .noAnimation {
-    animation-name: none;
-    background: transparent;
-  }
-
-  .devTools {
-    display: flex;
-    box-sizing: border-box;
-    background-color: black;
-    height: 60px;
-    padding: 1px 24px 1px 20px;
-    display: flex;
-    align-items: center;
-    z-index: 1;
-    flex-shrink: 0;
-
-    color: white;
-    mix-blend-mode: multiply;
-    background: rgb(0 0 0);
-    font-size: 30px;
-    font-family: Source Sans Pro;
-    -webkit-font-smoothing: antialiased;
-  }
-
-  .main {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-  }
-
-  @media (max-width: 720px) {
-    #clientAppSkeletonLoader .main {
-      flex-direction: column;
-      width: initial;
-    }
-  }
-
-  @container (max-width: 720px) {
-    #clientAppSkeletonLoader .main {
-      flex-direction: column;
-      width: initial;
-    }
-  }
-
-  .sideNav .main {
-    flex-direction: row;
-    width: 100%;
-  }
-
-  .nav {
-    flex-shrink: 0;
-    width: 100%;
-    height: 141px;
-    background-color: transparent;
-  }
-
-  @media (max-width: 720px) {
-    #clientAppSkeletonLoader .nav {
-      height: 61px;
-      width: initial;
-    }
-  }
-
-  @container (max-width: 720px) {
-    #clientAppSkeletonLoader .nav {
-      height: 61px;
-      width: initial;
-    }
-  }
-
-  .sideNav .nav {
-    height: 100%;
-    width: 251px;
-  }
-
-  .body {
-    z-index: 2;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    position: relative;
-  }
-
-  @media (max-width: 720px) {
-    #clientAppSkeletonLoader .body {
-      width: initial;
-      height: 100%;
-    }
-  }
-
-  @container (max-width: 720px) {
-    #clientAppSkeletonLoader .body {
-      width: initial;
-      height: 100%;
-    }
-  }
-
-  .sideNav .body {
-    width: 100%;
-    height: initial;
-  }
-
-  .body :global(svg > rect) {
-    fill: var(--spectrum-alias-background-color-primary);
-  }
-
-  .body :global(svg) {
-    flex-shrink: 0;
-  }
-
-  .bodyHorizontal {
-    display: flex;
-    flex-shrink: 0;
-  }
-
-  .bodyHorizontalPadding {
-    height: 100%;
-    flex-grow: 1;
-    background-color: var(--spectrum-alias-background-color-primary);
-  }
-
-  .bodyVerticalPadding {
-    width: 100%;
-    flex-grow: 1;
-    background-color: var(--spectrum-alias-background-color-primary);
-  }
-
-  .footer {
-    flex-shrink: 0;
-    box-sizing: border-box;
-    z-index: 1;
-    height: 52px;
-    width: 100%;
-  }
-
-  @media (max-width: 720px) {
-    #clientAppSkeletonLoader .footer {
-      border-top: none;
-    }
-  }
-
-  @container (max-width: 720px) {
-    #clientAppSkeletonLoader .footer {
-      border-top: none;
-    }
-  }
-
-  .sideNav .footer {
-    border-top: 3px solid var(--spectrum-alias-background-color-primary);
-  }
-
-  @keyframes shimmer {
-    0% {
-      left: -170%;
-    }
-
-    100% {
-      left: 170%;
-    }
-  }
-</style>

packages/frontend-core/src/components/index.js

@@ -5,4 +5,3 @@ export { default as UserAvatar } from "./UserAvatar.svelte"
 export { default as UserAvatars } from "./UserAvatars.svelte"
 export { default as Updating } from "./Updating.svelte"
 export { Grid } from "./grid"
-export { default as ClientAppSkeleton } from "./ClientAppSkeleton.svelte"

packages/frontend-core/src/themes/midnight.css

@@ -17,8 +17,5 @@
     --modal-background: var(--spectrum-global-color-gray-50);
     --drop-shadow: rgba(0, 0, 0, 0.25) !important;
     --spectrum-global-color-blue-100: rgba(35, 40, 50) !important;
-
-    --spectrum-alias-background-color-secondary: var(--spectrum-global-color-gray-75);
-    --spectrum-alias-background-color-primary: var(--spectrum-global-color-gray-100);
 }
 

packages/frontend-core/src/themes/nord.css

@@ -50,7 +50,4 @@
   --modal-background: var(--spectrum-global-color-gray-50);
   --drop-shadow: rgba(0, 0, 0, 0.15) !important;
   --spectrum-global-color-blue-100: rgb(56, 65, 84) !important;
-
-  --spectrum-alias-background-color-secondary: var(--spectrum-global-color-gray-75);
-  --spectrum-alias-background-color-primary: var(--spectrum-global-color-gray-100);
 }

packages/server/package.json

@@ -52,7 +52,6 @@
     "@budibase/pro": "0.0.0",
     "@budibase/shared-core": "0.0.0",
     "@budibase/string-templates": "0.0.0",
-    "@budibase/frontend-core": "0.0.0",
     "@budibase/types": "0.0.0",
     "@bull-board/api": "5.10.2",
     "@bull-board/koa": "5.10.2",

packages/server/src/api/controllers/static/index.ts

@@ -1,5 +1,7 @@
 import { InvalidFileExtensions } from "@budibase/shared-core"
+
 import AppComponent from "./templates/BudibaseApp.svelte"
+
 import { join } from "../../../utilities/centralPath"
 import * as uuid from "uuid"
 import { ObjectStoreBuckets } from "../../../constants"
@@ -22,13 +24,7 @@ import AWS from "aws-sdk"
 import fs from "fs"
 import sdk from "../../../sdk"
 import * as pro from "@budibase/pro"
-import {
+import { App, Ctx, ProcessAttachmentResponse } from "@budibase/types"
-  UserCtx,
-  App,
-  Ctx,
-  ProcessAttachmentResponse,
-  Feature,
-} from "@budibase/types"
 import {
   getAppMigrationVersion,
   getLatestMigrationId,
@@ -36,61 +32,6 @@ import {
 
 import send from "koa-send"
 
-const getThemeVariables = (theme: string) => {
-  if (theme === "spectrum--lightest") {
-    return `
-      --spectrum-global-color-gray-50: rgb(255, 255, 255);
-      --spectrum-global-color-gray-200: rgb(244, 244, 244);
-      --spectrum-global-color-gray-300: rgb(234, 234, 234);
-      --spectrum-alias-background-color-primary: var(--spectrum-global-color-gray-50);
-    `
-  }
-  if (theme === "spectrum--light") {
-    return `
-    --spectrum-global-color-gray-50: rgb(255, 255, 255);
-    --spectrum-global-color-gray-200: rgb(234, 234, 234);
-    --spectrum-global-color-gray-300: rgb(225, 225, 225);
-    --spectrum-alias-background-color-primary: var(--spectrum-global-color-gray-50);
-
-    `
-  }
-  if (theme === "spectrum--dark") {
-    return `
-    --spectrum-global-color-gray-100: rgb(50, 50, 50);
-    --spectrum-global-color-gray-200: rgb(62, 62, 62);
-    --spectrum-global-color-gray-300: rgb(74, 74, 74);
-    --spectrum-alias-background-color-primary: var(--spectrum-global-color-gray-100);
-    `
-  }
-  if (theme === "spectrum--darkest") {
-    return `
-  --spectrum-global-color-gray-100: rgb(30, 30, 30);
-  --spectrum-global-color-gray-200: rgb(44, 44, 44);
-  --spectrum-global-color-gray-300: rgb(57, 57, 57);
-  --spectrum-alias-background-color-primary: var(--spectrum-global-color-gray-100);
-    `
-  }
-  if (theme === "spectrum--nord") {
-    return `
-    --spectrum-global-color-gray-100: #3b4252;
-
-  --spectrum-global-color-gray-200: #424a5c;
-  --spectrum-global-color-gray-300: #4c566a;
-  --spectrum-alias-background-color-primary: var(--spectrum-global-color-gray-100);
-    `
-  }
-  if (theme === "spectrum--midnight") {
-    return `
-    --hue: 220;
-    --sat: 10%;
-    --spectrum-global-color-gray-100: hsl(var(--hue), var(--sat), 17%);
-    --spectrum-global-color-gray-200: hsl(var(--hue), var(--sat), 20%);
-    --spectrum-global-color-gray-300: hsl(var(--hue), var(--sat), 24%);
-    --spectrum-alias-background-color-primary: var(--spectrum-global-color-gray-100);
-    `
-  }
-}
-
 export const toggleBetaUiFeature = async function (ctx: Ctx) {
   const cookieName = `beta:${ctx.params.feature}`
 
@@ -205,7 +146,7 @@ const requiresMigration = async (ctx: Ctx) => {
   return requiresMigrations
 }
 
-export const serveApp = async function (ctx: UserCtx) {
+export const serveApp = async function (ctx: Ctx) {
   const needMigrations = await requiresMigration(ctx)
 
   const bbHeaderEmbed =
@@ -226,19 +167,9 @@ export const serveApp = async function (ctx: UserCtx) {
     const appInfo = await db.get<any>(DocumentType.APP_METADATA)
     let appId = context.getAppId()
 
-    const hideDevTools = !!ctx.params.appUrl
-    const sideNav = appInfo.navigation.navigation === "Left"
-    const hideFooter =
-      ctx?.user?.license?.features?.includes(Feature.BRANDING) || false
-    const themeVariables = getThemeVariables(appInfo?.theme)
-
     if (!env.isJest()) {
       const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins)
-
       const { head, html, css } = AppComponent.render({
-        hideDevTools,
-        sideNav,
-        hideFooter,
         metaImage:
           branding?.metaImageUrl ||
           "https://res.cloudinary.com/daog6scxm/image/upload/v1698759482/meta-images/plain-branded-meta-image-coral_ocxmgu.png",
@@ -263,7 +194,7 @@ export const serveApp = async function (ctx: UserCtx) {
       ctx.body = await processString(appHbs, {
         head,
         body: html,
-        css: `:root{${themeVariables}} ${css.code}`,
+        style: css.code,
         appId,
         embedded: bbHeaderEmbed,
       })

packages/server/src/api/controllers/static/templates/BudibaseApp.svelte

@@ -1,6 +1,4 @@
 <script>
-  import ClientAppSkeleton from "@budibase/frontend-core/src/components/ClientAppSkeleton.svelte"
-
   export let title = ""
   export let favicon = ""
 
@@ -11,10 +9,6 @@
   export let clientLibPath
   export let usedPlugins
   export let appMigrating
-
-  export let hideDevTools
-  export let sideNav
-  export let hideFooter
 </script>
 
 <svelte:head>
@@ -102,7 +96,6 @@
 </svelte:head>
 
 <body id="app">
-  <ClientAppSkeleton {hideDevTools} {sideNav} {hideFooter} />
   <div id="error">
     {#if clientLibPath}
       <h1>There was an error loading your app</h1>

packages/server/src/api/controllers/static/templates/app.hbs

@@ -1,12 +1,8 @@
 <html>
-  <script>
+
-    document.fonts.ready.then(() => {
-      window.parent.postMessage({ type: "docLoaded" });
-    })
-  </script>
   <head>
     {{{head}}}
-    <style>{{{css}}}</style>
+    <style>{{{style}}}</style>
   </head>
 
   <script>

packages/server/src/api/routes/static.ts

@@ -51,8 +51,8 @@ router
     controller.deleteObjects
   )
   .get("/app/preview", authorized(BUILDER), controller.serveBuilderPreview)
-  .get("/app/:appUrl/:path*", controller.serveApp)
   .get("/:appId/:path*", controller.serveApp)
+  .get("/app/:appUrl/:path*", controller.serveApp)
   .post(
     "/api/attachments/:datasourceId/url",
     authorized(PermissionType.TABLE, PermissionLevel.READ),

scripts/build.js

@@ -17,6 +17,12 @@ const { nodeExternalsPlugin } = require("esbuild-node-externals")
 const svelteCompilePlugin = {
   name: 'svelteCompile',
   setup(build) {
+    // This resolve handler is necessary to bundle the Svelte runtime into the the final output,
+    // otherwise the bundled script will attempt to resolve it at runtime
+    build.onResolve({ filter: /svelte\/internal/ }, async () => {
+      return { path: `${process.cwd()}/../../node_modules/svelte/src/runtime/internal/ssr.js` }
+    })
+
     // Compiles `.svelte` files into JS classes so that they can be directly imported into our
     // Typescript packages
     build.onLoad({ filter: /\.svelte$/ }, async (args) => {
@@ -74,11 +80,11 @@ async function runBuild(entry, outfile) {
     plugins: [
       svelteCompilePlugin,
       TsconfigPathsPlugin({ tsconfig: tsconfigPathPluginContent }),
-      nodeExternalsPlugin({
+      nodeExternalsPlugin(),
-        allowList: ["@budibase/frontend-core", "svelte"]
-      }),
     ],
     preserveSymlinks: true,
+    loader: {
+    },
     metafile: true,
     external: [
       "deasync",