Merge branch 'master' of github.com:Budibase/budibase

packages/core/.gitignore

@@ -40,3 +40,4 @@ flow-typed/npm/*
 
 .idea
 npm-debug.log.*
+dist

packages/core/rollup.config.js

@@ -59,7 +59,7 @@ export default {
     external: [
         "lodash", "lodash/fp", "date-fns",
         "lunr", "safe-buffer", "shortid",
-        "@nx-js/compiler-util"
+        "@nx-js/compiler-util", "bcryptjs"
     ]
   };
 

packages/materialdesign-components/components.json

@@ -3,9 +3,17 @@
   "h1": {
     "name": "H1",
     "description": "An HTML H1 tag",
-		"props" : {
+    "props": {
       "text": "string",
-			"className":"string"
+      "className": "string"
+    },
+    "tags": []
+  },
+  "button": {
+    "name": "Button",
+    "description": "A button",
+    "props": {
+      "raised": "bool"
     },
     "tags": []
   }

packages/materialdesign-components/package.json

@@ -13,18 +13,22 @@
   },
   "devDependencies": {
     "@budibase/client": "^0.0.16",
+    "@material/button": "^4.0.0",
     "@nx-js/compiler-util": "^2.0.0",
     "bcryptjs": "^2.4.3",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.15",
     "npm-run-all": "^4.1.5",
     "rollup": "^1.11.0",
+    "rollup-plugin-alias": "^2.2.0",
     "rollup-plugin-commonjs": "^10.0.2",
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-livereload": "^1.0.1",
     "rollup-plugin-node-resolve": "^5.0.0",
+    "rollup-plugin-postcss": "^2.0.5",
     "rollup-plugin-svelte": "^5.0.0",
     "rollup-plugin-terser": "^5.1.1",
+    "sass": "^1.25.1-test.1",
     "shortid": "^2.2.15",
     "sirv-cli": "^0.4.4",
     "svelte": "^3.12.1"

packages/materialdesign-components/rollup.config.js

@@ -1,20 +1,37 @@
-import svelte from 'rollup-plugin-svelte';
+import svelte from "rollup-plugin-svelte";
-import resolve from 'rollup-plugin-node-resolve';
+import postcss from "rollup-plugin-postcss";
+import resolve from "rollup-plugin-node-resolve";
+import path from "path";
+
+const postcssOptions = () => ({
+  extensions: [".scss", ".sass"],
+  extract: false,
+  minimize: true,
+  use: [
+    [
+      "sass",
+      {
+        includePaths: ["./node_modules"]
+      }
+    ]
+  ]
+});
 
 export default {
-	input: 'src/index.js',
+  input: "src/index.js",
   output: [
     {
       file: "dist/index.js",
-			format: 'esm', 
+      format: "esm",
-			name:"budibaseStandardComponents",
+      name: "budibaseStandardComponents",
       sourcemap: "inline"
     }
   ],
   plugins: [
     svelte({
-			hydratable:true
+      hydratable: true
     }),
-		resolve()
+    resolve(),
+    postcss(postcssOptions())
   ]
 };

packages/materialdesign-components/rollup.generatorsconfig.js

@@ -0,0 +1,14 @@
+import resolve from "rollup-plugin-node-resolve";
+
+export default {
+  input: "src/generators.js",
+  output: [
+    {
+      file: "dist/generators.js",
+      format: "esm",
+      name: "budibaseStandardComponents",
+      sourcemap: "inline"
+    }
+  ],
+  plugins: [resolve()]
+};

packages/materialdesign-components/rollup.testconfig.js

@@ -1,59 +1,113 @@
-import svelte from 'rollup-plugin-svelte';
+import svelte from "rollup-plugin-svelte";
-import resolve from 'rollup-plugin-node-resolve';
+import resolve from "rollup-plugin-node-resolve";
-import commonjs from 'rollup-plugin-commonjs';
+import commonjs from "rollup-plugin-commonjs";
-import livereload from 'rollup-plugin-livereload';
+import livereload from "rollup-plugin-livereload";
-import { terser } from 'rollup-plugin-terser';
+import { terser } from "rollup-plugin-terser";
-import json from 'rollup-plugin-json';
+import json from "rollup-plugin-json";
+import alias from "rollup-plugin-alias";
+import path from "path";
+
+const aliases = {
+  resolve: [".js", ".svelte"],
+  entries: [
+    { find: "@BBMD", replacement: path.resolve(__dirname, "dist/index.js") }
+  ]
+};
 
 const production = !process.env.ROLLUP_WATCH;
 
 const lodash_fp_exports = [
-    "find", "isUndefined", "split", "max",
+  "find",
-    "last", "union", "reduce", "isObject",
+  "isUndefined",
-    "cloneDeep", "some", "isArray", "map",
+  "split",
-    "filter", "keys", "isFunction", "isEmpty",
+  "max",
-    "countBy", "join", "includes", "flatten",
+  "last",
-    "constant", "first", "intersection", "take",
+  "union",
-    "has", "mapValues", "isString", "isBoolean",
+  "reduce",
-    "isNull", "isNumber", "isObjectLike", "isDate",
+  "isObject",
-    "clone", "values", "keyBy", "isNaN",
+  "cloneDeep",
-    "isInteger", "toNumber"];
+  "some",
+  "isArray",
+  "map",
+  "filter",
+  "keys",
+  "isFunction",
+  "isEmpty",
+  "countBy",
+  "join",
+  "includes",
+  "flatten",
+  "constant",
+  "first",
+  "intersection",
+  "take",
+  "has",
+  "mapValues",
+  "isString",
+  "isBoolean",
+  "isNull",
+  "isNumber",
+  "isObjectLike",
+  "isDate",
+  "clone",
+  "values",
+  "keyBy",
+  "isNaN",
+  "isInteger",
+  "toNumber"
+];
 
 const lodash_exports = [
-    "flow", "head",  "find","each",
+  "flow",
-    "tail", "findIndex", "startsWith", 
+  "head",
-    "dropRight", "takeRight", 
+  "find",
-    "trim", "split", "replace", 
+  "each",
-    "merge", "assign"];
+  "tail",
+  "findIndex",
+  "startsWith",
+  "dropRight",
+  "takeRight",
+  "trim",
+  "split",
+  "replace",
+  "merge",
+  "assign"
+];
 
 const coreExternal = [
-	"lodash", "lodash/fp", "date-fns",
+  "lodash",
-	"lunr", "safe-buffer", "shortid",
+  "lodash/fp",
-	"@nx-js/compiler-util", "bcryptjs"
+  "date-fns",
+  "lunr",
+  "safe-buffer",
+  "shortid",
+  "@nx-js/compiler-util",
+  "bcryptjs"
 ];
 
 export default {
-	input: 'src/Test/testMain.js',
+  input: "src/Test/testMain.js",
   output: {
     sourcemap: true,
-		format: 'iife',
+    format: "iife",
-		name: 'app',
+    name: "app",
-		file: 'public/bundle.js',
+    file: "public/bundle.js",
     globals: {
-			"crypto": "crypto"
+      crypto: "crypto"
     }
   },
   plugins: [
+    alias(aliases),
     svelte({
       // enable run-time checks when not in production
       dev: !production,
       // we'll extract any component CSS out into
       // a separate file — better for performance
       css: css => {
-				css.write('public/bundle.css');
+        css.write("public/bundle.css");
       },
 
-			hydratable:true
+      hydratable: true
     }),
 
     // If you have external dependencies installed from
@@ -64,24 +118,26 @@ export default {
     resolve({
       browser: true,
       dedupe: importee => {
-				return importee === 'svelte' 
+        return (
-					   || importee.startsWith('svelte/')
+          importee === "svelte" ||
-					   || coreExternal.includes(importee);
+          importee.startsWith("svelte/") ||
+          coreExternal.includes(importee)
+        );
       },
       preferBuiltins: true
     }),
     commonjs({
       namedExports: {
         "lodash/fp": lodash_fp_exports,
-				"lodash":lodash_exports,
+        lodash: lodash_exports,
-				"shortid": ["generate"]
+        shortid: ["generate"]
       }
     }),
     json(),
 
     // Watch the `public` directory and refresh the
     // browser on changes when not in production
-		!production && livereload('public'),
+    !production && livereload("public"),
 
     // If we're building for production (npm run build
     // instead of npm run dev), minify

packages/materialdesign-components/src/Button.svelte

@@ -0,0 +1,12 @@
+<script>
+  import "@material/button/mdc-button.scss";
+  export let raised = false;
+
+  let c = raised ? "mdc-button mdc-button--raised" : "mdc-button";
+</script>
+
+<button class={c}>
+  <div class="mdc-button__ripple" />
+
+  <span class="mdc-button__label">Button</span>
+</button>

packages/materialdesign-components/src/Test/TestApp.svelte

@@ -1,40 +1,35 @@
 <script>
-import createApp from "./createApp";
+  import createApp from "./createApp";
-import { props } from "./props";
+  import { props } from "./props";
 
-let _bb;
+  let _bb;
 
-const _appPromise = createApp();
+  const _appPromise = createApp();
-_appPromise.then(a => _bb = a);
+  _appPromise.then(a => (_bb = a));
 
-const testProps = props.justAnH1;
+  const testProps = props.justAnH1;
+  const button = props.button;
 
-let currentComponent;
+  let currentComponent;
 
-$: {
+  $: {
-    if(_bb && currentComponent) {
+    if (_bb && currentComponent) {
-        _bb.hydrateChildren([testProps], currentComponent);
+      _bb.hydrateChildren([testProps, button], currentComponent);
+    }
   }
-}
-
-
-
 </script>
 
-{#await _appPromise}
-loading
-{:then _bb}
-
-<div id="current_component" bind:this={currentComponent}>
-</div>
-
-{/await}
-
-
 <style>
-#current_component {
+  #current_component {
     height: 100%;
     width: 100%;
-}
+  }
 </style>
 
+{#await _appPromise}
+  loading
+{:then _bb}
+
+  <div id="current_component" bind:this={currentComponent} />
+
+{/await}

packages/materialdesign-components/src/Test/props.js

@@ -1,10 +1,12 @@
-
 export const props = {
-
+  justAnH1: {
-    justAnH1 : {
+    _component: "@budibase/materialdesign-components/h1",
-        _component:"@budibase/materialdesign-components/h1",
     _children: [],
     text: "This is a Header"
+  },
+  button: {
+    _component: "@budibase/materialdesign-components/button",
+    _children: [],
+    raised: true
   }
-
+};
-}

packages/materialdesign-components/src/Test/testComponents.js

@@ -1,3 +1,4 @@
 import h1 from "../H1.svelte";
+import { button } from "@BBMD";
 
-export default {h1};
+export default { h1, button };

packages/materialdesign-components/src/index.js

@@ -1,2 +1,3 @@
-export {default as h1} from  "./H1.svelte";
+export { default as h1 } from "./H1.svelte";
+export { default as button } from "./Button.svelte";
 

packages/server/appPackages/testApp/yarn.lock

@@ -3,22 +3,28 @@
 
 
 "@budibase/client@file:../../../client":
-  version "0.0.15"
+  version "0.0.16"
   dependencies:
     "@nx-js/compiler-util" "^2.0.0"
+    bcryptjs "^2.4.3"
     lodash "^4.17.15"
     lunr "^2.3.5"
     shortid "^2.2.8"
     svelte "^3.9.2"
 
 "@budibase/standard-components@file:../../../standard-components":
-  version "0.0.15"
+  version "0.0.16"
 
 "@nx-js/compiler-util@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@nx-js/compiler-util/-/compiler-util-2.0.0.tgz#c74c12165fa2f017a292bb79af007e8fce0af297"
   integrity sha512-AxSQbwj9zqt8DYPZ6LwZdytqnwfiOEdcFdq4l8sdjkZmU2clTht7RDLCI8xvkp7KqgcNaOGlTeCM55TULWruyQ==
 
+bcryptjs@^2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
+  integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms=
+
 lodash@^4.17.15:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"

packages/server/yarn.lock

@@ -131,29 +131,6 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@budibase/client@^0.0.16":
-  version "0.0.16"
-  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.0.16.tgz#4eef9373816448e99cafd2714f417c6610af5e69"
-  integrity sha512-fx4ptePj7+IehM37xdNPHdu5jEUgAFmDx23jI0yb4sI6Z5U4gxH10FZYyoJ/A9KdzmShsIfgrmudV5ffvoehdg==
-  dependencies:
-    "@nx-js/compiler-util" "^2.0.0"
-    lodash "^4.17.15"
-    lunr "^2.3.5"
-    shortid "^2.2.8"
-    svelte "^3.9.2"
-
-"@budibase/core@^0.0.16":
-  version "0.0.16"
-  resolved "https://registry.yarnpkg.com/@budibase/core/-/core-0.0.16.tgz#efff16876f906b2aa59803c3312ec7593664b623"
-  integrity sha512-DvzfurHHp9KkSjkvbGbKsVczR5ne38bMLRA2hHEJxAmC0Tshld06cEq7HMy2BmPb6kaC1URYHlFs/gPhW2cSFQ==
-  dependencies:
-    "@nx-js/compiler-util" "^2.0.0"
-    date-fns "^1.29.0"
-    lodash "^4.17.13"
-    lunr "^2.3.5"
-    safe-buffer "^5.1.2"
-    shortid "^2.2.8"
-
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -322,11 +299,6 @@
     path-to-regexp "^1.1.1"
     urijs "^1.19.0"
 
-"@nx-js/compiler-util@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@nx-js/compiler-util/-/compiler-util-2.0.0.tgz#c74c12165fa2f017a292bb79af007e8fce0af297"
-  integrity sha512-AxSQbwj9zqt8DYPZ6LwZdytqnwfiOEdcFdq4l8sdjkZmU2clTht7RDLCI8xvkp7KqgcNaOGlTeCM55TULWruyQ==
-
 "@types/babel__core@^7.1.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f"
@@ -1073,11 +1045,6 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@^1.29.0:
-  version "1.30.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
-  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
-
 debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -2785,7 +2752,7 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
-lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15:
+lodash@^4.17.11, lodash@^4.17.13:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -2810,11 +2777,6 @@ lru-cache@^4.0.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-lunr@^2.3.5:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.8.tgz#a8b89c31f30b5a044b97d2d28e2da191b6ba2072"
-  integrity sha512-oxMeX/Y35PNFuZoHp+jUj5OSEmLCaIH4KTFJh7a93cHBoFmpw2IoPs22VIz7vyO2YUnx2Tn9dzIwO2P/4quIRg==
-
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -2976,11 +2938,6 @@ nan@^2.12.1:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
   integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
 
-nanoid@^2.1.0:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.8.tgz#2dbb0224231b246e3b4c819de7bfea6384dabf08"
-  integrity sha512-g1z+n5s26w0TGKh7gjn7HCqurNKMZWzH08elXzh/gM/csQHd/UqDV6uxMghQYg9IvqRPm1QpeMk50YMofHvEjQ==
-
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -3816,13 +3773,6 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
-shortid@^2.2.8:
-  version "2.2.15"
-  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.15.tgz#2b902eaa93a69b11120373cd42a1f1fe4437c122"
-  integrity sha512-5EaCy2mx2Jgc/Fdn9uuDuNIIfWBpzY4XIlhoqtXF6qsf+/+SGZ+FxDdX/ZsMZiWupIWNqAEmiNY4RC+LSmCeOw==
-  dependencies:
-    nanoid "^2.1.0"
-
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -4100,11 +4050,6 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-svelte@^3.9.2:
-  version "3.16.7"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.16.7.tgz#9ade80a4bbbac95595c676dd817222f632fa2c07"
-  integrity sha512-egrva1UklB1n7KAv179IhDpQzMGAvubJUlOQ9PitmmZmAfrCUEgrQnx2vPxn2s+mGV3aYegXvJ/yQ35N2SfnYQ==
-
 symbol-tree@^3.2.2:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"