Merge branch 'develop' into fix/cypress-port-conflicts

5 years ago · c65d4e9888
16 changed files with 2582 additions and 5304 deletions
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.74-alpha.0",
+  "version": "1.0.74-alpha.1",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/backend-core",
-  "version": "1.0.74-alpha.0",
+  "version": "1.0.74-alpha.1",
  "description": "Budibase backend core libraries used in server and worker",
  "main": "src/index.js",
  "author": "Budibase",
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/bbui",
  "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.74-alpha.0",
+  "version": "1.0.74-alpha.1",
  "license": "MPL-2.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
--- a/packages/bbui/src/Button/Button.svelte
+++ b/packages/bbui/src/Button/Button.svelte
@ -29,6 +29,7 @@
  {disabled}
  on:click|preventDefault
  on:mouseover={() => (showTooltip = true)}
+  on:focus={() => (showTooltip = true)}
  on:mouseleave={() => (showTooltip = false)}
 >
  {#if icon}
--- a/packages/builder/nuxt.config.js
+++ b/packages/builder/nuxt.config.js
@ -0,0 +1,4 @@
+export default {
+  ssr: false,
+  target: "static",
+}
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "1.0.74-alpha.0",
+  "version": "1.0.74-alpha.1",
  "license": "GPL-3.0",
  "private": true,
  "scripts": {
@ -65,10 +65,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^1.0.74-alpha.0",
-    "@budibase/client": "^1.0.74-alpha.0",
-    "@budibase/frontend-core": "^1.0.74-alpha.0",
-    "@budibase/string-templates": "^1.0.74-alpha.0",
+    "@budibase/bbui": "^1.0.74-alpha.1",
+    "@budibase/client": "^1.0.74-alpha.1",
+    "@budibase/frontend-core": "^1.0.74-alpha.1",
+    "@budibase/string-templates": "^1.0.74-alpha.1",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@ -90,7 +90,7 @@
 </script>

 <DrawerContent>
-  <div className="container">
+  <div class="container">
    <Layout noPadding>
      <Body size="S">
        {#if !filters?.length}
--- a/packages/builder/yarn.lock
+++ b/packages/builder/yarn.lock
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "1.0.74-alpha.0",
+  "version": "1.0.74-alpha.1",
  "description": "Budibase CLI, for developers, self hosting and migrations.",
  "main": "src/index.js",
  "bin": {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "1.0.74-alpha.0",
+  "version": "1.0.74-alpha.1",
  "license": "MPL-2.0",
  "module": "dist/budibase-client.js",
  "main": "dist/budibase-client.js",
@ -19,12 +19,25 @@
    "dev:builder": "rollup -cw"
  },
  "dependencies": {
-    "@budibase/bbui": "^1.0.74-alpha.0",
-    "@budibase/frontend-core": "^1.0.74-alpha.0",
-    "@budibase/string-templates": "^1.0.74-alpha.0",
+    "@budibase/bbui": "^1.0.74-alpha.1",
+    "@budibase/frontend-core": "^1.0.74-alpha.1",
+    "@budibase/string-templates": "^1.0.74-alpha.1",
+    "@spectrum-css/button": "^3.0.3",
+    "@spectrum-css/card": "^3.0.3",
+    "@spectrum-css/divider": "^1.0.3",
+    "@spectrum-css/link": "^3.1.3",
+    "@spectrum-css/page": "^3.0.1",
+    "@spectrum-css/tag": "^3.1.4",
+    "@spectrum-css/typography": "^3.0.2",
+    "@spectrum-css/vars": "^3.0.1",
+    "apexcharts": "^3.22.1",
+    "dayjs": "^1.10.5",
    "regexparam": "^1.3.0",
    "rollup-plugin-polyfill-node": "^0.8.0",
    "shortid": "^2.2.15",
+    "svelte": "^3.38.2",
+    "svelte-apexcharts": "^1.0.2",
+    "svelte-flatpickr": "^3.1.0",
    "svelte-spa-router": "^3.0.5"
  },
  "devDependencies": {
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@ -1,12 +1,12 @@
 {
  "name": "@budibase/frontend-core",
-  "version": "1.0.74-alpha.0",
+  "version": "1.0.74-alpha.1",
  "description": "Budibase frontend core libraries used in builder and client",
  "author": "Budibase",
  "license": "MPL-2.0",
  "svelte": "src/index.js",
  "dependencies": {
-    "@budibase/bbui": "^1.0.74-alpha.0",
+    "@budibase/bbui": "^1.0.74-alpha.1",
    "lodash": "^4.17.21",
    "svelte": "^3.46.2"
  }
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "1.0.74-alpha.0",
+  "version": "1.0.74-alpha.1",
  "description": "Budibase Web Server",
  "main": "src/index.ts",
  "repository": {
@ -73,9 +73,9 @@
  "license": "GPL-3.0",
  "dependencies": {
    "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.74-alpha.0",
-    "@budibase/client": "^1.0.74-alpha.0",
-    "@budibase/string-templates": "^1.0.74-alpha.0",
+    "@budibase/backend-core": "^1.0.74-alpha.1",
+    "@budibase/client": "^1.0.74-alpha.1",
+    "@budibase/string-templates": "^1.0.74-alpha.1",
    "@bull-board/api": "^3.7.0",
    "@bull-board/koa": "^3.7.0",
    "@elastic/elasticsearch": "7.10.0",
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@ -2772,7 +2772,7 @@ acorn-walk@^7.1.1:
  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==

-acorn-walk@^8.1.1:
+acorn-walk@^8.1.1, acorn-walk@^8.2.0:
  version "8.2.0"
  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@ -2797,7 +2797,7 @@ acorn@^7.1.1:
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==

-acorn@^8.2.4, acorn@^8.4.1:
+acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.0:
  version "8.7.0"
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
@ -12114,9 +12114,12 @@ verror@1.3.6:
    extsprintf "1.0.2"

 vm2@^3.9.3:
-  version "3.9.5"
-  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.5.tgz#5288044860b4bbace443101fcd3bddb2a0aa2496"
-  integrity sha512-LuCAHZN75H9tdrAiLFf030oW7nJV5xwNMuk1ymOZwopmuK3d2H4L1Kv4+GFHgarKiLfXXLFU+7LDABHnwOkWng==
+  version "3.9.6"
+  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.6.tgz#2f9b2fd0d82802dcd872e1011869ba8ae6b74778"
+  integrity sha512-BF7euUjgO+ezsz2UKex9kO9M/PtDNOf+KEpiqNepZsgf1MT7JYfJEIvG8BoYhZMLAVjqevFJ0UmXNuETe8m5dQ==
+  dependencies:
+    acorn "^8.7.0"
+    acorn-walk "^8.2.0"

 vuvuzela@1.0.3:
  version "1.0.3"
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "1.0.74-alpha.0",
+  "version": "1.0.74-alpha.1",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "1.0.74-alpha.0",
+  "version": "1.0.74-alpha.1",
  "description": "Budibase background service",
  "main": "src/index.ts",
  "repository": {
@ -34,8 +34,8 @@
  "author": "Budibase",
  "license": "GPL-3.0",
  "dependencies": {
-    "@budibase/backend-core": "^1.0.74-alpha.0",
-    "@budibase/string-templates": "^1.0.74-alpha.0",
+    "@budibase/backend-core": "^1.0.74-alpha.1",
+    "@budibase/string-templates": "^1.0.74-alpha.1",
    "@koa/router": "^8.0.0",
    "@sentry/node": "^6.0.0",
    "@techpass/passport-openidconnect": "^0.3.0",