Merge pull request #1556 from Budibase/fixes/kev-cleanups

Minor fixes

package.json

@@ -40,12 +40,5 @@
     "test:e2e:ci": "lerna run cy:ci",
     "build:docker": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh && cd -",
     "build:docker:staging": "cd hosting/scripts/linux/ && ./release-to-docker-hub.sh staging && cd -"
-  },
-  "dependencies": {
-    "@spectrum-css/actionbutton": "^1.0.1",
-    "@spectrum-css/actiongroup": "^1.0.1",
-    "@spectrum-css/link": "^3.1.1",
-    "@spectrum-css/menu": "^3.0.1",
-    "@spectrum-css/toast": "^3.0.1"
   }
 }

packages/builder/src/pages/builder/portal/manage/_layout.svelte

@@ -1,7 +1,7 @@
 <script>
   import { Page } from "@budibase/bbui"
   import { auth } from "stores/portal"
-  import { redirect } from "@roxi/routify"
+  import { page, redirect } from "@roxi/routify"
 
   // Only admins allowed here
   $: {
@@ -9,10 +9,12 @@
       $redirect("../")
     }
   }
+
+  $: console.log($page)
 </script>
 
 {#if $auth.isAdmin}
-  <Page>
+  <Page wide={$page.path.includes("email/:template")}>
     <slot />
   </Page>
 {/if}

packages/builder/src/pages/builder/portal/manage/email/[template].svelte

@@ -69,7 +69,6 @@
   }
 </script>
 
-<Page wide>
 <Layout gap="XS" noPadding>
   <div class="back">
     <ActionButton
@@ -133,7 +132,6 @@
     </div>
   </Tab>
 </Tabs>
-</Page>
 
 <style>
   .template-editor {

packages/builder/src/pages/builder/portal/manage/email/index.svelte

@@ -76,7 +76,6 @@
   fetchSmtp()
 </script>
 
-<Page>
 <Layout>
   <Layout noPadding gap="XS">
     <Heading size="M">Email</Heading>
@@ -140,7 +139,6 @@
     />
   {/if}
 </Layout>
-</Page>
 
 <style>
   .form-row {

packages/cli/package.json

@@ -11,6 +11,10 @@
   "scripts": {
     "build": "pkg . --out-path build"
   },
+  "pkg": {
+    "targets": [ "node14" ],
+    "outputPath": "build"
+  },
   "dependencies": {
     "axios": "^0.21.1",
     "chalk": "^4.1.0",

yarn.lock

@@ -824,31 +824,6 @@
     estree-walker "^1.0.1"
     micromatch "^4.0.2"
 
-"@spectrum-css/actionbutton@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577"
-  integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw==
-
-"@spectrum-css/actiongroup@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c"
-  integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA==
-
-"@spectrum-css/link@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb"
-  integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA==
-
-"@spectrum-css/menu@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe"
-  integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg==
-
-"@spectrum-css/toast@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796"
-  integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg==
-
 "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"