diff --git a/lerna.json b/lerna.json index 640c262a36..b53f4142a5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.6.2", + "version": "0.7.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/builder/package.json b/packages/builder/package.json index f8a2f6b60d..9de3db2b7b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.6.2", + "version": "0.7.4", "license": "AGPL-3.0", "private": true, "scripts": { @@ -63,27 +63,26 @@ } }, "dependencies": { - "@budibase/bbui": "^1.55.2", - "@budibase/client": "^0.6.2", - "@budibase/colorpicker": "^1.0.1", - "@budibase/string-templates": "^0.6.2", + "@budibase/bbui": "^1.56.0", + "@budibase/client": "^0.7.4", + "@budibase/colorpicker": "1.0.1", + "@budibase/string-templates": "^0.7.4", "@budibase/svelte-ag-grid": "^0.0.16", "@sentry/browser": "5.19.1", - "@svelteschool/svelte-forms": "^0.7.0", - "britecharts": "^2.16.0", + "@svelteschool/svelte-forms": "0.7.0", "codemirror": "^5.59.0", "d3-selection": "^1.4.1", "deepmerge": "^4.2.2", - "downloadjs": "^1.4.7", + "downloadjs": "1.4.7", "fast-sort": "^2.2.0", - "lodash": "^4.17.13", + "lodash": "4.17.13", "posthog-js": "1.4.5", - "remixicon": "^2.5.0", - "shortid": "^2.2.15", + "remixicon": "2.5.0", + "shortid": "2.2.15", "svelte-loading-spinners": "^0.1.1", - "svelte-portal": "^0.1.0", - "uuid": "^8.3.1", - "yup": "^0.29.2" + "svelte-portal": "0.1.0", + "uuid": "8.3.1", + "yup": "0.29.2" }, "devDependencies": { "@babel/core": "^7.5.5", diff --git a/packages/builder/src/builderStore/store/backend.js b/packages/builder/src/builderStore/store/backend.js index 0a235dd9a0..faf5b460f1 100644 --- a/packages/builder/src/builderStore/store/backend.js +++ b/packages/builder/src/builderStore/store/backend.js @@ -119,6 +119,18 @@ export const getBackendUiStore = () => { return json }, save: async (datasourceId, query) => { + const integrations = get(store).integrations + const dataSource = get(store).datasources.filter( + ds => ds._id === datasourceId + ) + // check if readable attribute is found + if (dataSource.length !== 0) { + const integration = integrations[dataSource[0].source] + const readable = integration.query[query.queryVerb].readable + if (readable) { + query.readable = readable + } + } query.datasourceId = datasourceId const response = await api.post(`/api/queries`, query) const json = await response.json() diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 439687d0c2..ed89d4316d 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -64,7 +64,11 @@ {:else if value.customType === 'password'} {:else if value.customType === 'email'} - + {:else if value.customType === 'table'} {:else if value.customType === 'row'} @@ -75,7 +79,7 @@ {:else if value.type === 'string' || value.type === 'number'} diff --git a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte index 24b6042940..3956e765ee 100644 --- a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte +++ b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte @@ -83,6 +83,7 @@
{@html helper.description || ''}
+ 
{helper.example || ''}
{/each} @@ -166,7 +167,13 @@ .binding__description { color: var(--grey-8); margin-top: 2px; + white-space: normal; } + + pre { + white-space: normal; + } + .binding__type { font-family: monospace; background-color: var(--grey-2); diff --git a/packages/builder/src/components/backend/DataTable/popovers/ExportPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/ExportPopover.svelte index 3e7642982a..af561668ec 100644 --- a/packages/builder/src/components/backend/DataTable/popovers/ExportPopover.svelte +++ b/packages/builder/src/components/backend/DataTable/popovers/ExportPopover.svelte @@ -20,13 +20,12 @@ let exportFormat = FORMATS[0].key async function exportView() { - const response = await api.post( - `/api/views/export?format=${exportFormat}`, - view + download( + `/api/views/export?view=${encodeURIComponent( + view.name + )}&format=${exportFormat}` ) - const downloadInfo = await response.json() onClosed() - window.location = downloadInfo.url } diff --git a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte index 47334267b6..76dbdf229c 100644 --- a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte @@ -103,6 +103,7 @@
{@html helper.description}
+ 
{helper.example || ''}
{/each} @@ -169,6 +170,11 @@ border-width: 1px 0 1px 0; } + pre, + .description { + white-space: normal; + } + li:hover { color: var(--ink); font-weight: 500; diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte index a260789b5e..6f78484339 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte @@ -80,7 +80,7 @@ class="icon" data-cy={`${key}-binding-button`} on:click={bindingDrawer.show}> - + {/if} @@ -144,7 +144,7 @@ border-top-right-radius: var(--border-radius-m); border-bottom-right-radius: var(--border-radius-m); color: var(--grey-7); - font-size: 16px; + font-size: 14px; } .icon:hover { color: var(--ink); diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte index 6f96b99d65..b8d975e2a4 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte @@ -36,7 +36,7 @@ return [...acc, ...viewsArr] }, []) $: queries = $backendUiStore.queries - .filter(query => query.queryVerb === "read") + .filter(query => query.queryVerb === "read" || query.readable) .map(query => ({ label: query.name, name: query.name, diff --git a/packages/builder/src/components/feedback/FeedbackNavLink.svelte b/packages/builder/src/components/feedback/FeedbackNavLink.svelte index 6cba6417d4..5b7a2faf2a 100644 --- a/packages/builder/src/components/feedback/FeedbackNavLink.svelte +++ b/packages/builder/src/components/feedback/FeedbackNavLink.svelte @@ -1,6 +1,7 @@
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte index 77f6d51476..0f38f7650f 100644 --- a/packages/builder/src/components/integration/QueryViewer.svelte +++ b/packages/builder/src/components/integration/QueryViewer.svelte @@ -132,7 +132,8 @@
- +
Enter query name:
+
{#if config}
@@ -216,7 +217,9 @@ diff --git a/packages/builder/src/components/start/AppCard.svelte b/packages/builder/src/components/start/AppCard.svelte index a64b0527ff..4efc298cdd 100644 --- a/packages/builder/src/components/start/AppCard.svelte +++ b/packages/builder/src/components/start/AppCard.svelte @@ -14,9 +14,12 @@ async function exportApp() { appExportLoading = true try { - download(`/api/backups/export?appId=${_id}`) + download( + `/api/backups/export?appId=${_id}&appname=${encodeURIComponent(name)}` + ) notifier.success("App Export Complete.") } catch (err) { + console.error(err) notifier.danger("App Export Failed.") } finally { appExportLoading = false @@ -29,13 +32,13 @@
- Open - {name} - → + Open {name} → {#if appExportLoading} - {:else}{/if} + {:else} + + {/if}
diff --git a/packages/builder/src/constants/completions.js b/packages/builder/src/constants/completions.js index 69f6ec551b..32de934324 100644 --- a/packages/builder/src/constants/completions.js +++ b/packages/builder/src/constants/completions.js @@ -7,6 +7,7 @@ export function handlebarsCompletions() { Object.entries(manifest[key]).map(([helperName, helperConfig]) => ({ text: helperName, path: helperName, + example: helperConfig.example, label: helperName, displayText: helperName, description: helperConfig.description, diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index 803b961fcd..186e330135 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -842,10 +842,10 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" -"@budibase/bbui@^1.55.2": - version "1.55.2" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.55.2.tgz#be636e8b86b7e516a08eb626bb50c4b1f9774bf8" - integrity sha512-CevH/olxDFIko9uwYUpUTevPmpShrLwJSR7+wn/JetZERwhTwbLhOXzpsyXaK226qQ8vWhm0U31HRSKI1HwDDg== +"@budibase/bbui@^1.56.0": + version "1.56.0" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.56.0.tgz#91376f11b43706fd380291e9a5283760996eb62b" + integrity sha512-OEFC7MapbJk7Bd7oo79cVOq9BIcK1x8XPHLC1lB2N4hts37IygzB4Egg6JZBD7rh7CqU8ppc4W7wkfQbaXEO1Q== dependencies: markdown-it "^12.0.2" quill "^1.3.7" @@ -854,7 +854,7 @@ svelte-portal "^1.0.0" turndown "^7.0.0" -"@budibase/colorpicker@^1.0.1": +"@budibase/colorpicker@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@budibase/colorpicker/-/colorpicker-1.0.1.tgz#940c180e7ebba0cb0756c4c8ef13f5dfab58e810" integrity sha512-+DTHYhU0sTi5RfCyd7AAvMsLFwyF/wgs0owf7KyQU+ZILRW+YsWa7OQMz+hKQfgVAmvzwrNz8ATiBlG3Ac6Asg== @@ -1257,7 +1257,7 @@ node-fetch "^2.6.0" utf-8-validate "^5.0.2" -"@svelteschool/svelte-forms@^0.7.0": +"@svelteschool/svelte-forms@0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@svelteschool/svelte-forms/-/svelte-forms-0.7.0.tgz#4ecba15e9a9ab2b04fad3d892931a561118a4cea" integrity sha512-TSt8ROqK6wq+Hav7EhZL1I0GtsZhg28aJuuDSviBzG/NG9pC0eprf8roWjl59DKHOVWIUTPTeY+T+lipb9gf8w== @@ -1775,11 +1775,6 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -base-64@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb" - integrity sha1-eAqZyE59YAJgNhURxId2E78k9rs= - base@^0.11.1: version "0.11.2" resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" @@ -1870,15 +1865,6 @@ braces@^3.0.1, braces@~3.0.2: dependencies: fill-range "^7.0.1" -britecharts@^2.16.0: - version "2.17.2" - resolved "https://registry.yarnpkg.com/britecharts/-/britecharts-2.17.2.tgz#78e7743e7c1dcaccd78ab7dacc479d37d509cdf2" - integrity sha512-+wMG/ci+UHPRIySppTs8wQZmmlYFQHn2bCvbNiWUOYd1qAoiEQyKA/dVtgdTyR09qM+h8b9YsFofaWHJRT1mQg== - dependencies: - base-64 "^0.1.0" - d3 "^5.16.0" - lodash.assign "^4.2.0" - brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" @@ -2282,16 +2268,16 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@2, commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - commander@2.17.x: version "2.17.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== +commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + commander@^5.0.0, commander@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" @@ -2536,254 +2522,11 @@ cypress@^5.1.0: url "^0.11.0" yauzl "^2.10.0" -d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f" - integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw== - -d3-axis@1: - version "1.0.12" - resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9" - integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ== - -d3-brush@1: - version "1.1.6" - resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b" - integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA== - dependencies: - d3-dispatch "1" - d3-drag "1" - d3-interpolate "1" - d3-selection "1" - d3-transition "1" - -d3-chord@1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f" - integrity sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA== - dependencies: - d3-array "1" - d3-path "1" - -d3-collection@1: - version "1.0.7" - resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e" - integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A== - -d3-color@1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" - integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q== - -d3-contour@1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3" - integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg== - dependencies: - d3-array "^1.1.1" - -d3-dispatch@1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58" - integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA== - -d3-drag@1: - version "1.2.5" - resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70" - integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w== - dependencies: - d3-dispatch "1" - d3-selection "1" - -d3-dsv@1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c" - integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g== - dependencies: - commander "2" - iconv-lite "0.4" - rw "1" - -d3-ease@1: - version "1.0.7" - resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2" - integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ== - -d3-fetch@1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7" - integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA== - dependencies: - d3-dsv "1" - -d3-force@1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b" - integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg== - dependencies: - d3-collection "1" - d3-dispatch "1" - d3-quadtree "1" - d3-timer "1" - -d3-format@1: - version "1.4.5" - resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4" - integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ== - -d3-geo@1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f" - integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg== - dependencies: - d3-array "1" - -d3-hierarchy@1: - version "1.1.9" - resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83" - integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ== - -d3-interpolate@1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987" - integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA== - dependencies: - d3-color "1" - -d3-path@1: - version "1.0.9" - resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf" - integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg== - -d3-polygon@1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e" - integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ== - -d3-quadtree@1: - version "1.0.7" - resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135" - integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA== - -d3-random@1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291" - integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ== - -d3-scale-chromatic@1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98" - integrity sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg== - dependencies: - d3-color "1" - d3-interpolate "1" - -d3-scale@2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f" - integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw== - dependencies: - d3-array "^1.2.0" - d3-collection "1" - d3-format "1" - d3-interpolate "1" - d3-time "1" - d3-time-format "2" - -d3-selection@1, d3-selection@^1.1.0, d3-selection@^1.4.1: +d3-selection@^1.4.1: version "1.4.2" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c" integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg== -d3-shape@1: - version "1.3.7" - resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7" - integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw== - dependencies: - d3-path "1" - -d3-time-format@2: - version "2.3.0" - resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850" - integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ== - dependencies: - d3-time "1" - -d3-time@1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1" - integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA== - -d3-timer@1: - version "1.0.10" - resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5" - integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw== - -d3-transition@1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398" - integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA== - dependencies: - d3-color "1" - d3-dispatch "1" - d3-ease "1" - d3-interpolate "1" - d3-selection "^1.1.0" - d3-timer "1" - -d3-voronoi@1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297" - integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg== - -d3-zoom@1: - version "1.8.3" - resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a" - integrity sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ== - dependencies: - d3-dispatch "1" - d3-drag "1" - d3-interpolate "1" - d3-selection "1" - d3-transition "1" - -d3@^5.16.0: - version "5.16.0" - resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877" - integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw== - dependencies: - d3-array "1" - d3-axis "1" - d3-brush "1" - d3-chord "1" - d3-collection "1" - d3-color "1" - d3-contour "1" - d3-dispatch "1" - d3-drag "1" - d3-dsv "1" - d3-ease "1" - d3-fetch "1" - d3-force "1" - d3-format "1" - d3-geo "1" - d3-hierarchy "1" - d3-interpolate "1" - d3-path "1" - d3-polygon "1" - d3-quadtree "1" - d3-random "1" - d3-scale "2" - d3-scale-chromatic "1" - d3-selection "1" - d3-shape "1" - d3-time "1" - d3-time-format "2" - d3-timer "1" - d3-transition "1" - d3-voronoi "1" - d3-zoom "1" - dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -2995,7 +2738,7 @@ dotenv@^8.2.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== -downloadjs@^1.4.7: +downloadjs@1.4.7: version "1.4.7" resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c" integrity sha1-9p+W+UDg0FU9rCkROYZaPNAQHjw= @@ -3842,7 +3585,7 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== -iconv-lite@0.4, iconv-lite@0.4.24: +iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -5047,11 +4790,6 @@ lodash-es@^4.17.11: resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78" integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ== -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= - lodash.once@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" @@ -5062,7 +4800,12 @@ 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.13, lodash@^4.17.15, lodash@^4.17.19: +lodash@4.17.13: + version "4.17.13" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93" + integrity sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA== + +lodash@^4.17.15, lodash@^4.17.19: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -6135,7 +5878,7 @@ relateurl@0.2.x: resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= -remixicon@^2.5.0: +remixicon@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/remixicon/-/remixicon-2.5.0.tgz#b5e245894a1550aa23793f95daceadbf96ad1a41" integrity sha512-q54ra2QutYDZpuSnFjmeagmEiN9IMo56/zz5dDNitzKD23oFRw77cWo4TsrAdmdkPiEn8mxlrTqxnkujDbEGww== @@ -6436,11 +6179,6 @@ run-parallel@^1.1.9: resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef" integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw== -rw@1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" - integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= - rxjs@^6.3.3, rxjs@^6.5.5: version "6.6.3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" @@ -6583,10 +6321,10 @@ shellwords@^0.1.1: resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== -shortid@^2.2.15: - version "2.2.16" - resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" - integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== +shortid@2.2.15: + 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" @@ -6996,7 +6734,7 @@ svelte-loading-spinners@^0.1.1: resolved "https://registry.yarnpkg.com/svelte-loading-spinners/-/svelte-loading-spinners-0.1.1.tgz#a35a811b7db0389ec2a5de6904c718c58c36e1f9" integrity sha512-or4zs10VOdczOJo3u25IINXQOkZbLNAxMrXK0PRbzVoJtPQq/QZPNxI32383bpe+soYcEKmESbmW+JlW3MbUKQ== -svelte-portal@^0.1.0: +svelte-portal@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-0.1.0.tgz#cc2821cc84b05ed5814e0218dcdfcbebc53c1742" integrity sha512-kef+ksXVKun224mRxat+DdO4C+cGHla+fEcZfnBAvoZocwiaceOfhf5azHYOPXSSB1igWVFTEOF3CDENPnuWxg== @@ -7317,16 +7055,16 @@ util.promisify@^1.0.0: has-symbols "^1.0.1" object.getownpropertydescriptors "^2.1.0" +uuid@8.3.1: + version "8.3.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" + integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg== + uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^8.3.1: - version "8.3.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" - integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg== - validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -7586,10 +7324,10 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -yup@^0.29.2: - version "0.29.3" - resolved "https://registry.yarnpkg.com/yup/-/yup-0.29.3.tgz#69a30fd3f1c19f5d9e31b1cf1c2b851ce8045fea" - integrity sha512-RNUGiZ/sQ37CkhzKFoedkeMfJM0vNQyaz+wRZJzxdKE7VfDeVKH8bb4rr7XhRLbHJz5hSjoDNwMEIaKhuMZ8gQ== +yup@0.29.2: + version "0.29.2" + resolved "https://registry.yarnpkg.com/yup/-/yup-0.29.2.tgz#5302abd9024cca335b987793f8df868e410b7b67" + integrity sha512-FbAAeopli+TnpZ8Lzv2M72wltLw58iWBT7wW8FuAPFPb3CelXmSKCXQbV1o4keywpIK1BZ0ULTLv2s3w1CfOwA== dependencies: "@babel/runtime" "^7.10.5" fn-name "~3.0.0" diff --git a/packages/client/package.json b/packages/client/package.json index 6f5a1ce4fe..46a25f4baf 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.6.2", + "version": "0.7.4", "license": "MPL-2.0", "main": "dist/budibase-client.js", "module": "dist/budibase-client.js", @@ -9,14 +9,14 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/string-templates": "^0.6.2", + "@budibase/string-templates": "^0.7.4", "deep-equal": "^2.0.1", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" }, "devDependencies": { - "@budibase/standard-components": "^0.6.2", + "@budibase/standard-components": "^0.7.4", "@rollup/plugin-commonjs": "^16.0.0", "@rollup/plugin-node-resolve": "^10.0.0", "fs-extra": "^8.1.0", @@ -30,5 +30,5 @@ "svelte": "^3.30.0", "svelte-jester": "^1.0.6" }, - "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491" + "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd" } diff --git a/packages/client/src/api/views.js b/packages/client/src/api/views.js index 88dfbe5187..d173e53d53 100644 --- a/packages/client/src/api/views.js +++ b/packages/client/src/api/views.js @@ -18,7 +18,7 @@ export const fetchViewData = async ({ params.set("calculation", calculation) } if (groupBy) { - params.set("group", groupBy) + params.set("group", groupBy ? "true" : "false") } const QUERY_VIEW_URL = field diff --git a/packages/server/package.json b/packages/server/package.json index 7dc157db7c..9ac7e84a14 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.6.2", + "version": "0.7.4", "description": "Budibase Web Server", "main": "src/electron.js", "repository": { @@ -50,59 +50,59 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/client": "^0.6.2", - "@budibase/string-templates": "^0.6.2", - "@elastic/elasticsearch": "^7.10.0", - "@koa/router": "^8.0.0", - "@sendgrid/mail": "^7.1.1", - "@sentry/node": "^5.19.2", - "airtable": "^0.10.1", - "arangojs": "^7.2.0", + "@budibase/client": "^0.7.4", + "@budibase/string-templates": "^0.7.4", + "@elastic/elasticsearch": "7.10.0", + "@koa/router": "8.0.0", + "@sendgrid/mail": "7.1.1", + "@sentry/node": "5.19.2", + "airtable": "0.10.1", + "arangojs": "7.2.0", "aws-sdk": "^2.767.0", - "bcryptjs": "^2.4.3", - "chmodr": "^1.2.0", - "csvtojson": "^2.0.10", - "dotenv": "^8.2.0", - "download": "^8.0.0", - "electron-is-dev": "^1.2.0", - "electron-unhandled": "^3.0.2", - "electron-updater": "^4.3.1", - "electron-util": "^0.14.2", - "fix-path": "^3.0.0", - "fs-extra": "^8.1.0", - "jimp": "^0.16.1", - "joi": "^17.2.1", - "jsonschema": "^1.4.0", - "jsonwebtoken": "^8.5.1", - "koa": "^2.7.0", - "koa-body": "^4.2.0", - "koa-compress": "^4.0.1", - "koa-pino-logger": "^3.0.0", - "koa-send": "^5.0.0", - "koa-session": "^5.12.0", - "koa-static": "^5.0.0", - "lodash": "^4.17.13", - "mongodb": "^3.6.3", - "mssql": "^6.2.3", - "mysql": "^2.18.1", - "node-fetch": "^2.6.0", - "open": "^7.3.0", - "pg": "^8.5.1", - "pino-pretty": "^4.0.0", - "pouchdb": "^7.2.1", - "pouchdb-all-dbs": "^1.0.2", + "bcryptjs": "2.4.3", + "chmodr": "1.2.0", + "csvtojson": "2.0.10", + "dotenv": "8.2.0", + "download": "8.0.0", + "electron-is-dev": "1.2.0", + "electron-unhandled": "3.0.2", + "electron-updater": "4.3.1", + "electron-util": "0.14.2", + "fix-path": "3.0.0", + "fs-extra": "8.1.0", + "jimp": "0.16.1", + "joi": "17.2.1", + "jsonschema": "1.4.0", + "jsonwebtoken": "8.5.1", + "koa": "2.7.0", + "koa-body": "4.2.0", + "koa-compress": "4.0.1", + "koa-pino-logger": "3.0.0", + "koa-send": "5.0.0", + "koa-session": "5.12.0", + "koa-static": "5.0.0", + "lodash": "4.17.13", + "mongodb": "3.6.3", + "mssql": "6.2.3", + "mysql": "2.18.1", + "node-fetch": "2.6.0", + "open": "7.3.0", + "pg": "8.5.1", + "pino-pretty": "4.0.0", + "pouchdb": "7.2.1", + "pouchdb-all-dbs": "1.0.2", "pouchdb-find": "^7.2.2", - "pouchdb-replication-stream": "^1.2.9", - "sanitize-s3-objectkey": "^0.0.1", - "server-destroy": "^1.0.1", - "svelte": "^3.30.0", - "tar-fs": "^2.1.0", - "to-json-schema": "^0.2.5", - "uuid": "^3.3.2", - "validate.js": "^0.13.1", - "worker-farm": "^1.7.0", - "yargs": "^13.2.4", - "zlib": "^1.0.5" + "pouchdb-replication-stream": "1.2.9", + "sanitize-s3-objectkey": "0.0.1", + "server-destroy": "1.0.1", + "svelte": "3.30.0", + "tar-fs": "2.1.0", + "to-json-schema": "0.2.5", + "uuid": "3.3.2", + "validate.js": "0.13.1", + "worker-farm": "1.7.0", + "yargs": "13.2.4", + "zlib": "1.0.5" }, "devDependencies": { "@jest/test-sequencer": "^24.8.0", @@ -121,5 +121,5 @@ "./scripts/jestSetup.js" ] }, - "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491" + "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd" } diff --git a/packages/server/src/api/controllers/backup.js b/packages/server/src/api/controllers/backup.js index d021dca91f..a83f96165b 100644 --- a/packages/server/src/api/controllers/backup.js +++ b/packages/server/src/api/controllers/backup.js @@ -6,10 +6,12 @@ const fs = require("fs-extra") exports.exportAppDump = async function(ctx) { const { appId } = ctx.query + const appname = decodeURI(ctx.query.appname) + const backupsDir = path.join(os.homedir(), ".budibase", "backups") fs.ensureDirSync(backupsDir) - const backupIdentifier = `${appId} Backup: ${new Date()}.txt` + const backupIdentifier = `${appname}Backup${new Date().getTime()}.txt` await performDump({ dir: backupsDir, @@ -23,19 +25,4 @@ exports.exportAppDump = async function(ctx) { ctx.attachment(backupIdentifier) ctx.body = fs.createReadStream(backupFile) - // ctx.body = { - // url: `/api/backups/download/${backupIdentifier}`, - // } } - -// exports.downloadAppDump = async function(ctx) { -// const fileName = ctx.params.fileName - -// const backupsDir = path.join(os.homedir(), ".budibase", "backups") -// fs.ensureDirSync(backupsDir) - -// const backupFile = path.join(backupsDir, fileName) - -// ctx.attachment(fileName) -// ctx.body = fs.createReadStream(backupFile) -// } diff --git a/packages/server/src/api/controllers/query.js b/packages/server/src/api/controllers/query.js index 1aebfefa07..66de67e093 100644 --- a/packages/server/src/api/controllers/query.js +++ b/packages/server/src/api/controllers/query.js @@ -1,8 +1,18 @@ -const handlebars = require("handlebars") +const { processString } = require("@budibase/string-templates") const CouchDB = require("../../db") const { generateQueryID, getQueryParams } = require("../../db/utils") const { integrations } = require("../../integrations") +function formatResponse(resp) { + if (typeof resp === "string") { + resp = JSON.parse(resp) + } + if (!Array.isArray(resp)) { + resp = [resp] + } + return resp +} + exports.fetch = async function(ctx) { const db = new CouchDB(ctx.user.appId) @@ -29,19 +39,22 @@ exports.save = async function(ctx) { ctx.message = `Query ${query.name} saved successfully.` } -function enrichQueryFields(fields, parameters) { +async function enrichQueryFields(fields, parameters) { const enrichedQuery = {} // enrich the fields with dynamic parameters - for (let key in fields) { - const template = handlebars.compile(fields[key]) - enrichedQuery[key] = template(parameters) + for (let key of Object.keys(fields)) { + enrichedQuery[key] = await processString(fields[key], parameters) } if (enrichedQuery.json || enrichedQuery.customData) { - enrichedQuery.json = JSON.parse( - enrichedQuery.json || enrichedQuery.customData - ) + try { + enrichedQuery.json = JSON.parse( + enrichedQuery.json || enrichedQuery.customData + ) + } catch (err) { + throw { message: `JSON Invalid - error: ${err}` } + } delete enrichedQuery.customData } @@ -62,9 +75,11 @@ exports.preview = async function(ctx) { const { fields, parameters, queryVerb } = ctx.request.body - const enrichedQuery = enrichQueryFields(fields, parameters) + const enrichedQuery = await enrichQueryFields(fields, parameters) - ctx.body = await new Integration(datasource.config)[queryVerb](enrichedQuery) + ctx.body = formatResponse( + await new Integration(datasource.config)[queryVerb](enrichedQuery) + ) } exports.execute = async function(ctx) { @@ -80,17 +95,15 @@ exports.execute = async function(ctx) { return } - const enrichedQuery = enrichQueryFields( + const enrichedQuery = await enrichQueryFields( query.fields, ctx.request.body.parameters ) // call the relevant CRUD method on the integration class - const response = await new Integration(datasource.config)[query.queryVerb]( - enrichedQuery + ctx.body = formatResponse( + await new Integration(datasource.config)[query.queryVerb](enrichedQuery) ) - - ctx.body = response } exports.destroy = async function(ctx) { diff --git a/packages/server/src/api/controllers/row.js b/packages/server/src/api/controllers/row.js index 525df25c29..43633ee56c 100644 --- a/packages/server/src/api/controllers/row.js +++ b/packages/server/src/api/controllers/row.js @@ -9,7 +9,7 @@ const { ViewNames, } = require("../../db/utils") const usersController = require("./user") -const { coerceRowValues } = require("../../utilities") +const { coerceRowValues, enrichRows } = require("../../utilities") const TABLE_VIEW_BEGINS_WITH = `all${SEPARATOR}${DocumentTypes.TABLE}${SEPARATOR}` @@ -190,7 +190,15 @@ exports.fetchView = async function(ctx) { if (!calculation) { response.rows = response.rows.map(row => row.doc) - ctx.body = await linkRows.attachLinkInfo(appId, response.rows) + let table + try { + table = await db.get(ctx.params.tableId) + } catch (err) { + table = { + schema: {}, + } + } + ctx.body = await enrichRows(appId, table, response.rows) } if (calculation === CALCULATION_TYPES.STATS) { @@ -247,15 +255,15 @@ exports.search = async function(ctx) { exports.fetchTableRows = async function(ctx) { const appId = ctx.user.appId + const db = new CouchDB(appId) // special case for users, fetch through the user controller - let rows + let rows, + table = await db.get(ctx.params.tableId) if (ctx.params.tableId === ViewNames.USERS) { await usersController.fetch(ctx) rows = ctx.body } else { - const db = new CouchDB(appId) - const response = await db.allDocs( getRowParams(ctx.params.tableId, null, { include_docs: true, @@ -263,15 +271,16 @@ exports.fetchTableRows = async function(ctx) { ) rows = response.rows.map(row => row.doc) } - ctx.body = await linkRows.attachLinkInfo(appId, rows) + ctx.body = await enrichRows(appId, table, rows) } exports.find = async function(ctx) { const appId = ctx.user.appId const db = new CouchDB(appId) try { + const table = await db.get(ctx.params.tableId) const row = await findRow(db, appId, ctx.params.tableId, ctx.params.rowId) - ctx.body = await linkRows.attachLinkInfo(appId, row) + ctx.body = await enrichRows(appId, table, row) } catch (err) { ctx.throw(400, err) } @@ -356,8 +365,9 @@ exports.fetchEnrichedRow = async function(ctx) { keys: linkVals.map(linkVal => linkVal.id), }) // need to include the IDs in these rows for any links they may have - let linkedRows = await linkRows.attachLinkInfo( + let linkedRows = await enrichRows( appId, + table, response.rows.map(row => row.doc) ) // insert the link rows in the correct place throughout the main row diff --git a/packages/server/src/api/controllers/static/index.js b/packages/server/src/api/controllers/static/index.js index 770cbaf088..bf01314795 100644 --- a/packages/server/src/api/controllers/static/index.js +++ b/packages/server/src/api/controllers/static/index.js @@ -17,11 +17,12 @@ const CouchDB = require("../../../db") const setBuilderToken = require("../../../utilities/builder/setBuilderToken") const fileProcessor = require("../../../utilities/fileProcessor") const env = require("../../../environment") +const { OBJ_STORE_DIRECTORY } = require("../../../constants") function objectStoreUrl() { if (env.SELF_HOSTED) { // can use a relative url for this as all goes through the proxy (this is hosted in minio) - return `/app-assets/assets` + return OBJ_STORE_DIRECTORY } else { return "https://cdn.app.budi.live/assets" } diff --git a/packages/server/src/api/controllers/table.js b/packages/server/src/api/controllers/table.js index 488809d156..1dd53e2277 100644 --- a/packages/server/src/api/controllers/table.js +++ b/packages/server/src/api/controllers/table.js @@ -108,7 +108,7 @@ exports.save = async function(ctx) { } // update linked rows - await linkRows.updateLinks({ + const linkResp = await linkRows.updateLinks({ appId, eventType: oldTable ? linkRows.EventType.TABLE_UPDATED @@ -116,6 +116,9 @@ exports.save = async function(ctx) { table: tableToSave, oldTable: oldTable, }) + if (linkResp != null && linkResp._rev) { + tableToSave._rev = linkResp._rev + } // don't perform any updates until relationships have been // checked by the updateLinks function diff --git a/packages/server/src/api/controllers/view/index.js b/packages/server/src/api/controllers/view/index.js index c4e8c1e372..05dc299754 100644 --- a/packages/server/src/api/controllers/view/index.js +++ b/packages/server/src/api/controllers/view/index.js @@ -83,23 +83,42 @@ const controller = { ctx.message = `View ${ctx.params.viewName} saved successfully.` }, exportView: async ctx => { - const view = ctx.query.view + const db = new CouchDB(ctx.user.appId) + const designDoc = await db.get("_design/database") + + const viewName = decodeURI(ctx.query.view) + + const view = designDoc.views[viewName] const format = ctx.query.format - // Fetch view rows - ctx.params.viewName = view.name - ctx.query.group = view.groupBy - if (view.field) { - ctx.query.stats = true - ctx.query.field = view.field + if (view) { + ctx.params.viewName = viewName + // Fetch view rows + ctx.query = { + group: view.meta.groupBy, + calculation: view.meta.calculation, + stats: !!view.meta.field, + field: view.meta.field, + } + } else { + // table all_ view + ctx.params.viewName = viewName } + await fetchView(ctx) + let schema = view && view.meta && view.meta.schema + if (!schema) { + const tableId = ctx.params.tableId || view.meta.tableId + const table = await db.get(tableId) + schema = table.schema + } + // Export part - let headers = Object.keys(view.schema) + let headers = Object.keys(schema) const exporter = exporters[format] const exportedFile = exporter(headers, ctx.body) - const filename = `${view.name}.${format}` + const filename = `${viewName}.${format}` fs.writeFileSync(join(os.tmpdir(), filename), exportedFile) ctx.attachment(filename) diff --git a/packages/server/src/api/routes/backup.js b/packages/server/src/api/routes/backup.js index 283bec39a4..7f24a452e5 100644 --- a/packages/server/src/api/routes/backup.js +++ b/packages/server/src/api/routes/backup.js @@ -6,10 +6,5 @@ const { BUILDER } = require("../../utilities/security/permissions") const router = Router() router.get("/api/backups/export", authorized(BUILDER), controller.exportAppDump) -// .get( -// "/api/backups/download/:fileName", -// authorized(BUILDER), -// controller.downloadAppDump -// ) module.exports = router diff --git a/packages/server/src/api/routes/query.js b/packages/server/src/api/routes/query.js index ae5e6bc317..8a84138af5 100644 --- a/packages/server/src/api/routes/query.js +++ b/packages/server/src/api/routes/query.js @@ -26,6 +26,7 @@ function generateQueryValidation() { name: Joi.string().required(), fields: Joi.object().required(), datasourceId: Joi.string().required(), + readable: Joi.boolean(), parameters: Joi.array().items(Joi.object({ name: Joi.string(), default: Joi.string() diff --git a/packages/server/src/api/routes/tests/couchTestUtils.js b/packages/server/src/api/routes/tests/couchTestUtils.js index 463d88e637..59a9b6a7c2 100644 --- a/packages/server/src/api/routes/tests/couchTestUtils.js +++ b/packages/server/src/api/routes/tests/couchTestUtils.js @@ -37,29 +37,31 @@ exports.defaultHeaders = appId => { return headers } -exports.createTable = async (request, appId, table) => { - if (table != null && table._id) { - delete table._id - } - table = table || { - name: "TestTable", - type: "table", - key: "name", - schema: { - name: { +exports.BASE_TABLE = { + name: "TestTable", + type: "table", + key: "name", + schema: { + name: { + type: "string", + constraints: { type: "string", - constraints: { - type: "string", - }, - }, - description: { - type: "string", - constraints: { - type: "string", - }, }, }, + description: { + type: "string", + constraints: { + type: "string", + }, + }, + }, +} + +exports.createTable = async (request, appId, table, removeId = true) => { + if (removeId && table != null && table._id) { + delete table._id } + table = table || exports.BASE_TABLE const res = await request .post(`/api/tables`) @@ -68,6 +70,25 @@ exports.createTable = async (request, appId, table) => { return res.body } +exports.createLinkedTable = async (request, appId) => { + // get the ID to link to + const table = await exports.createTable(request, appId) + table.schema.link = { + type: "link", + fieldName: "link", + tableId: table._id, + } + return exports.createTable(request, appId, table, false) +} + +exports.createAttachmentTable = async (request, appId) => { + const table = await exports.createTable(request, appId) + table.schema.attachment = { + type: "attachment", + } + return exports.createTable(request, appId, table, false) +} + exports.getAllFromTable = async (request, appId, tableId) => { const res = await request .get(`/api/${tableId}/rows`) diff --git a/packages/server/src/api/routes/tests/row.spec.js b/packages/server/src/api/routes/tests/row.spec.js index 0698250050..47977ed207 100644 --- a/packages/server/src/api/routes/tests/row.spec.js +++ b/packages/server/src/api/routes/tests/row.spec.js @@ -3,7 +3,11 @@ const { createTable, supertest, defaultHeaders, + createLinkedTable, + createAttachmentTable, } = require("./couchTestUtils"); +const { enrichRows } = require("../../../utilities") +const env = require("../../../environment") describe("/rows", () => { let request @@ -270,4 +274,44 @@ describe("/rows", () => { }) }) + + describe("enrich row unit test", () => { + it("should allow enriching some linked rows", async () => { + const table = await createLinkedTable(request, appId) + const firstRow = (await createRow({ + name: "Test Contact", + description: "original description", + tableId: table._id + })).body + const secondRow = (await createRow({ + name: "Test 2", + description: "og desc", + link: [firstRow._id], + tableId: table._id, + })).body + const enriched = await enrichRows(appId, table, [secondRow]) + expect(enriched[0].link.length).toBe(1) + expect(enriched[0].link[0]).toBe(firstRow._id) + }) + }) + + it("should allow enriching attachment rows", async () => { + const table = await createAttachmentTable(request, appId) + const row = (await createRow({ + name: "test", + description: "test", + attachment: [{ + url: "/test/thing", + }], + tableId: table._id, + })).body + // the environment needs configured for this + env.CLOUD = 1 + env.SELF_HOSTED = 1 + const enriched = await enrichRows(appId, table, [row]) + expect(enriched[0].attachment[0].url).toBe(`/app-assets/assets/${appId}/test/thing`) + // remove env config + env.CLOUD = undefined + env.SELF_HOSTED = undefined + }) }) \ No newline at end of file diff --git a/packages/server/src/api/routes/view.js b/packages/server/src/api/routes/view.js index 4a32b4c592..0ae12f687c 100644 --- a/packages/server/src/api/routes/view.js +++ b/packages/server/src/api/routes/view.js @@ -12,6 +12,7 @@ const usage = require("../../middleware/usageQuota") const router = Router() router + .get("/api/views/export", authorized(BUILDER), viewController.exportView) .get( "/api/views/:viewName", authorized(PermissionTypes.VIEW, PermissionLevels.READ), @@ -25,6 +26,5 @@ router viewController.destroy ) .post("/api/views", authorized(BUILDER), usage, viewController.save) - .post("/api/views/export", authorized(BUILDER), viewController.exportView) module.exports = router diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js index 5a97a62af6..2e18de98af 100644 --- a/packages/server/src/constants/index.js +++ b/packages/server/src/constants/index.js @@ -43,3 +43,4 @@ exports.AuthTypes = AuthTypes exports.USERS_TABLE_SCHEMA = USERS_TABLE_SCHEMA exports.BUILDER_CONFIG_DB = "builder-config-db" exports.HOSTING_DOC = "hosting-doc" +exports.OBJ_STORE_DIRECTORY = "/app-assets/assets" diff --git a/packages/server/src/db/linkedRows/LinkController.js b/packages/server/src/db/linkedRows/LinkController.js index d6116b76f6..061a9ac1ae 100644 --- a/packages/server/src/db/linkedRows/LinkController.js +++ b/packages/server/src/db/linkedRows/LinkController.js @@ -252,7 +252,11 @@ class LinkController { tableId: table._id, fieldName: fieldName, } - await this._db.put(linkedTable) + const response = await this._db.put(linkedTable) + // special case for when linking back to self, make sure rev updated + if (linkedTable._id === table._id) { + table._rev = response.rev + } } } return table diff --git a/packages/server/src/db/linkedRows/linkUtils.js b/packages/server/src/db/linkedRows/linkUtils.js index 5f9dca4088..cb669cf5c7 100644 --- a/packages/server/src/db/linkedRows/linkUtils.js +++ b/packages/server/src/db/linkedRows/linkUtils.js @@ -31,11 +31,14 @@ exports.createLinkView = async appId => { thisId: doc1.rowId, fieldName: doc1.fieldName, }) - emit([doc2.tableId, doc2.rowId], { - id: doc1.rowId, - thisId: doc2.rowId, - fieldName: doc2.fieldName, - }) + // if linking to same table can't emit twice + if (doc1.tableId !== doc2.tableId) { + emit([doc2.tableId, doc2.rowId], { + id: doc1.rowId, + thisId: doc2.rowId, + fieldName: doc2.fieldName, + }) + } } }.toString(), } @@ -81,6 +84,13 @@ exports.getLinkDocuments = async function({ // filter to get unique entries const foundIds = [] linkRows = linkRows.filter(link => { + // make sure anything unique is the correct key + if ( + (tableId && link.key[0] !== tableId) || + (rowId && link.key[1] !== rowId) + ) { + return false + } const unique = foundIds.indexOf(link.id) === -1 if (unique) { foundIds.push(link.id) diff --git a/packages/server/src/integrations/dynamodb.js b/packages/server/src/integrations/dynamodb.js index c2b19e70e8..6f3c5787ba 100644 --- a/packages/server/src/integrations/dynamodb.js +++ b/packages/server/src/integrations/dynamodb.js @@ -17,20 +17,27 @@ const SCHEMA = { type: FIELD_TYPES.PASSWORD, required: true, }, + endpoint: { + type: FIELD_TYPES.STRING, + required: false, + default: "https://dynamodb.us-east-1.amazonaws.com", + }, }, query: { create: { type: QUERY_TYPES.FIELDS, + customisable: true, fields: { table: { type: FIELD_TYPES.STRING, required: true, }, - customisable: true, }, }, read: { type: QUERY_TYPES.FIELDS, + customisable: true, + readable: true, fields: { table: { type: FIELD_TYPES.STRING, @@ -39,30 +46,51 @@ const SCHEMA = { index: { type: FIELD_TYPES.STRING, }, - customisable: true, + }, + }, + scan: { + type: QUERY_TYPES.FIELDS, + customisable: true, + readable: true, + fields: { + table: { + type: FIELD_TYPES.STRING, + required: true, + }, + index: { + type: FIELD_TYPES.STRING, + }, + }, + }, + get: { + type: QUERY_TYPES.FIELDS, + customisable: true, + readable: true, + fields: { + table: { + type: FIELD_TYPES.STRING, + required: true, + }, }, }, update: { type: QUERY_TYPES.FIELDS, + customisable: true, fields: { table: { type: FIELD_TYPES.STRING, required: true, }, - customisable: true, }, }, delete: { type: QUERY_TYPES.FIELDS, + customisable: true, fields: { table: { type: FIELD_TYPES.STRING, required: true, }, - key: { - type: FIELD_TYPES.STRING, - required: true, - }, }, }, }, @@ -72,7 +100,15 @@ class DynamoDBIntegration { constructor(config) { this.config = config this.connect() - this.client = new AWS.DynamoDB.DocumentClient() + let options = { + correctClockSkew: true, + } + if (config.endpoint) { + options.endpoint = config.endpoint + } + this.client = new AWS.DynamoDB.DocumentClient({ + correctClockSkew: true, + }) } async connect() { @@ -80,37 +116,65 @@ class DynamoDBIntegration { } async create(query) { - const response = await this.client.query({ + const params = { TableName: query.table, - Item: query.json, - }) - return response + ...query.json, + } + return this.client.put(params).promise() } async read(query) { - const response = await this.client.query({ - TableName: query.Table, + const params = { + TableName: query.table, ...query.json, - }) + } + if (query.index) { + params.IndexName = query.index + } + const response = await this.client.query(params).promise() + if (response.Items) { + return response.Items + } return response } + async scan(query) { + const params = { + TableName: query.table, + ...query.json, + } + if (query.index) { + params.IndexName = query.index + } + const response = await this.client.scan(params).promise() + if (response.Items) { + return response.Items + } + return response + } + + async get(query) { + const params = { + TableName: query.table, + ...query.json, + } + return this.client.get(params).promise() + } + async update(query) { - const response = await this.client.query({ + const params = { TableName: query.Table, ...query.json, - }) - return response + } + return this.client.update(params).promise() } async delete(query) { - const response = await this.client.query({ - TableName: query.Table, - Key: { - id: query.key, - }, - }) - return response + const params = { + TableName: query.table, + ...query.json, + } + return this.client.delete(params).promise() } } diff --git a/packages/server/src/integrations/microsoftSqlServer.js b/packages/server/src/integrations/microsoftSqlServer.js index b7713cf15b..c99f4ed39f 100644 --- a/packages/server/src/integrations/microsoftSqlServer.js +++ b/packages/server/src/integrations/microsoftSqlServer.js @@ -17,6 +17,11 @@ const SCHEMA = { type: FIELD_TYPES.STRING, default: "localhost", }, + port: { + type: FIELD_TYPES.NUMBER, + required: false, + default: 1433, + }, database: { type: FIELD_TYPES.STRING, default: "root", diff --git a/packages/server/src/integrations/mysql.js b/packages/server/src/integrations/mysql.js index f5ea1caaca..a6e6ce7afc 100644 --- a/packages/server/src/integrations/mysql.js +++ b/packages/server/src/integrations/mysql.js @@ -1,25 +1,31 @@ const mysql = require("mysql") +const { FIELD_TYPES } = require("./Integration") const SCHEMA = { docs: "https://github.com/mysqljs/mysql", datasource: { host: { - type: "string", + type: FIELD_TYPES.STRING, default: "localhost", required: true, }, + port: { + type: FIELD_TYPES.NUMBER, + default: 1433, + required: false, + }, user: { - type: "string", + type: FIELD_TYPES.STRING, default: "root", required: true, }, password: { - type: "password", + type: FIELD_TYPES.PASSWORD, default: "root", required: true, }, database: { - type: "string", + type: FIELD_TYPES.STRING, required: true, }, }, diff --git a/packages/server/src/utilities/index.js b/packages/server/src/utilities/index.js index 9da2937a4d..31cc74b5e6 100644 --- a/packages/server/src/utilities/index.js +++ b/packages/server/src/utilities/index.js @@ -3,6 +3,8 @@ const { DocumentTypes, SEPARATOR } = require("../db/utils") const fs = require("fs") const { cloneDeep } = require("lodash/fp") const CouchDB = require("../db") +const { OBJ_STORE_DIRECTORY } = require("../constants") +const linkRows = require("../db/linkedRows") const APP_PREFIX = DocumentTypes.APP + SEPARATOR @@ -211,3 +213,34 @@ exports.getAllApps = async () => { .map(({ value }) => value) } } + +/** + * This function "enriches" the input rows with anything they are supposed to contain, for example + * link records or attachment links. + * @param {string} appId the ID of the application for which rows are being enriched. + * @param {object} table the table from which these rows came from originally, this is used to determine + * the schema of the rows and then enrich. + * @param {object[]} rows the rows which are to be enriched. + * @returns {object[]} the enriched rows will be returned. + */ +exports.enrichRows = async (appId, table, rows) => { + // attach any linked row information + const enriched = await linkRows.attachLinkInfo(appId, rows) + // update the attachments URL depending on hosting + if (env.CLOUD && env.SELF_HOSTED) { + for (let [property, column] of Object.entries(table.schema)) { + if (column.type === "attachment") { + for (let row of enriched) { + if (row[property] == null || row[property].length === 0) { + continue + } + row[property].forEach(attachment => { + attachment.url = `${OBJ_STORE_DIRECTORY}/${appId}/${attachment.url}` + attachment.url = attachment.url.replace("//", "/") + }) + } + } + } + } + return enriched +} diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 4f651d0557..844f9c491f 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -228,26 +228,58 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" -"@budibase/client@^0.6.2": - version "0.6.2" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.6.2.tgz#21591491ffce976b6cd2a674708b94b6ec51c7f3" - integrity sha512-RMtAsJYi+GSv3pcv3O8fcqxQJi61cmvfeKlkPffBGwBif5mnaONQT83NK7ebE995YywxYwK1FlwAm4Idg0QGbQ== +"@budibase/client@^0.7.4": + version "0.7.4" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.7.4.tgz#c1bea648250781e29d33da3b3c6fa3011881764c" + integrity sha512-Jr0wLMCkDb++w01Nilp7btP7ZnyGgD6NdV1YmKds2dY8Aw+p4opAWRT3ADebUqOhttS71HcX7EEYXY6XDFZ5lw== dependencies: - "@budibase/string-templates" "^0.6.2" + "@budibase/string-templates" "^0.7.4" deep-equal "^2.0.1" regexparam "^1.3.0" shortid "^2.2.15" svelte-spa-router "^3.0.5" -"@budibase/string-templates@^0.6.2": - version "0.6.2" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.6.2.tgz#0b86f80e49eeff12433f7f75a2a8a6faef6b59df" - integrity sha512-1Ci/PiNdecaKKojzACrOL4xFoWpiPnAAWEnIKT0ZHhCBGAwtftp+9WuZ/4liisBcmhmdtiW0LVd7A26YqvQzUg== +"@budibase/handlebars-helpers@^0.11.3": + version "0.11.3" + resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.3.tgz#b6e5c91b83e8906e7d7ff10ddde277a3d561016e" + integrity sha512-MS1ptZEYq8o9J3tNLM7cZ2RGSSJIer4GiMIUHtbBI3sC9UKqZebao1JYNfmZKpNjntuqhZKgjqc5GfnVIEjsYQ== dependencies: - handlebars "^4.7.6" - handlebars-helpers "^0.10.0" + arr-flatten "^1.1.0" + array-sort "^0.1.4" + define-property "^1.0.0" + extend-shallow "^3.0.2" + "falsey" "^0.3.2" + for-in "^1.0.2" + for-own "^1.0.0" + get-object "^0.2.0" + get-value "^2.0.6" + handlebars "^4.0.11" handlebars-utils "^1.0.6" + has-value "^1.0.0" helper-date "^1.0.1" + helper-markdown "^1.0.0" + helper-md "^0.2.2" + html-tag "^2.0.0" + is-even "^1.0.0" + is-glob "^4.0.0" + is-number "^4.0.0" + kind-of "^6.0.0" + logging-helpers "^1.0.0" + micromatch "^3.1.4" + relative "^3.0.2" + striptags "^3.1.0" + to-gfm-code-block "^0.1.1" + year "^0.2.1" + +"@budibase/string-templates@^0.7.4": + version "0.7.4" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.7.4.tgz#108628cfbb4f329347fabbe23646144481f9b52b" + integrity sha512-ChJGUxnGcHriHfewbxtfuVBsS/BwzuZDO3W5LzH7wMWlc0Yk4yXLZwTINoiZvUmGHFdmsxVnhPIfPjRsQvkv/Q== + dependencies: + "@budibase/handlebars-helpers" "^0.11.3" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" lodash "^4.17.20" "@cnakazawa/watch@^1.0.3": @@ -266,7 +298,7 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@elastic/elasticsearch@^7.10.0": +"@elastic/elasticsearch@7.10.0": version "7.10.0" resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-7.10.0.tgz#da105a9c1f14146f9f2cab4e7026cb7949121b8d" integrity sha512-vXtMAQf5/DwqeryQgRriMtnFppJNLc/R7/R0D8E+wG5/kGM5i7mg+Hi7TM4NZEuXgtzZ2a/Nf7aR0vLyrxOK/w== @@ -765,108 +797,118 @@ "@babel/runtime" "^7.7.2" regenerator-runtime "^0.13.3" -"@koa/router@^8.0.0": - version "8.0.8" - resolved "https://registry.yarnpkg.com/@koa/router/-/router-8.0.8.tgz#95f32d11373d03d89dcb63fabe9ac6f471095236" - integrity sha512-FnT93N4NUehnXr+juupDmG2yfi0JnWdCmNEuIXpCG4TtG+9xvtrLambBH3RclycopVUOEYAim2lydiNBI7IRVg== +"@koa/router@8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@koa/router/-/router-8.0.0.tgz#fd4ffa6f03d8293a04c023cb4a22b612401fbe70" + integrity sha512-P70CGOGs6JPu/mnrd9lt6ESzlBXLHT/uTK8+5U4M7Oapt8la/tiZv2c7X9jq0ksFsM59RH3AwJYzKOuavDcjIw== dependencies: - debug "^4.1.1" - http-errors "^1.7.3" - koa-compose "^4.1.0" - methods "^1.1.2" - path-to-regexp "1.x" - urijs "^1.19.2" + debug "^3.1.0" + http-errors "^1.3.1" + koa-compose "^3.0.0" + methods "^1.0.1" + path-to-regexp "^1.1.1" + urijs "^1.19.0" -"@sendgrid/client@^7.2.6": - version "7.2.6" - resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.2.6.tgz#28374927b5d9b3b351b9426f4a218d23d590c958" - integrity sha512-AOB3IVlB76SMYdaLEtWGm6/GwrOv0xlAOkyCqk5+XifJRqL2pl8a9lfxFZ9BEnWrdqPJPJ1/omopj0P7d5ZPmw== +"@sendgrid/client@^7.1.1": + version "7.4.2" + resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.4.2.tgz#204a9fbb5dc05a721a5d8cd8930f57f9f8e612b1" + integrity sha512-bu8lLbRD+OV7YsYNemEy8DRoxs8/8u325EXNlQ3VaqhcpbM0eSvdL5e5Wa7VZpbczcNCJmf/sr/uqFmwcO5S+A== dependencies: - "@sendgrid/helpers" "^7.2.6" - axios "^0.19.2" + "@sendgrid/helpers" "^7.4.2" + axios "^0.21.1" -"@sendgrid/helpers@^7.2.6": - version "7.2.6" - resolved "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.2.6.tgz#5d15b8914940147c0635c9a3d2a93fed8c73dc71" - integrity sha512-J2xniPBOVo4ASzx+xc735OovHGj/v9oNrDo1Bb5fwTg/kmUxWxeoKZRkB+KLdciwmTtVrZjYLdQB3pMFIe9lAw== +"@sendgrid/helpers@^7.0.1", "@sendgrid/helpers@^7.4.2": + version "7.4.2" + resolved "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.4.2.tgz#d80f17da439fd241fd69f8a894d93a0fdd19df0f" + integrity sha512-b/IyBwT4zrOfXA0ISvWZsnhYz+5uAO20n68J8n/6qe5P1E2p0L7kWNTN5LYu0S7snJPUlbEa6FpfrSKzEcP9JA== dependencies: - chalk "^2.0.1" deepmerge "^4.2.2" -"@sendgrid/mail@^7.1.1": - version "7.2.6" - resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.2.6.tgz#8f6a398ad75fb1ed7a35a9bb18cbdac111637ef6" - integrity sha512-eP9MuqEZIgt4bHaoufWqKGUY4Bo7FUgST3WGNYIDXIe1rP2dV6/JR7Ac2Dl9iW22gy15nc58fLGIGa41XbwtuA== +"@sendgrid/mail@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.1.1.tgz#26191594722d5961de1b61cd9c48fa9a69fd197b" + integrity sha512-VXdJ9J6vBNMw+wMIGFRvms6EmV6pvoRHMWoLJGweHlsZDnvmK3rWUnnNaS3OdDQ3A8B5bMv2WKsEnHsMZ6iDUg== dependencies: - "@sendgrid/client" "^7.2.6" - "@sendgrid/helpers" "^7.2.6" + "@sendgrid/client" "^7.1.1" + "@sendgrid/helpers" "^7.0.1" -"@sentry/core@5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.25.0.tgz#525ad37f9e8a95603768e3b74b437d5235a51578" - integrity sha512-hY6Zmo7t/RV+oZuvXHP6nyAj/QnZr2jW0e7EbL5YKMV8q0vlnjcE0LgqFXme726OJemoLk67z+sQOJic/Ztehg== +"@sentry/apm@5.19.2": + version "5.19.2" + resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.19.2.tgz#369fdcbc9fa5db992f707b24f3165e106a277cf7" + integrity sha512-V7p5niqG/Nn1OSMAyreChiIrQFYzFHKADKNaDEvIXqC4hxFnMG8lPRqEFJH49fNjsFBFfIG9iY1rO1ZFg3S42Q== dependencies: - "@sentry/hub" "5.25.0" - "@sentry/minimal" "5.25.0" - "@sentry/types" "5.25.0" - "@sentry/utils" "5.25.0" + "@sentry/browser" "5.19.2" + "@sentry/hub" "5.19.2" + "@sentry/minimal" "5.19.2" + "@sentry/types" "5.19.2" + "@sentry/utils" "5.19.2" tslib "^1.9.3" -"@sentry/hub@5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.25.0.tgz#6932535604cafaee1ac7f361b0e7c2ce8f7e7bc3" - integrity sha512-kOlOiJV8wMX50lYpzMlOXBoH7MNG0Ho4RTusdZnXZBaASq5/ljngDJkLr6uylNjceZQP21wzipCQajsJMYB7EQ== +"@sentry/browser@5.19.2": + version "5.19.2" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.19.2.tgz#8bad445b8d1efd50e6510bb43b3018b941f6e5cb" + integrity sha512-o6Z532n+0N5ANDzgR9GN+Q6CU7zVlIJvBEW234rBiB+ZZj6XwTLS1dD+JexGr8lCo8PeXI2rypKcj1jUGLVW8w== dependencies: - "@sentry/types" "5.25.0" - "@sentry/utils" "5.25.0" + "@sentry/core" "5.19.2" + "@sentry/types" "5.19.2" + "@sentry/utils" "5.19.2" tslib "^1.9.3" -"@sentry/minimal@5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.25.0.tgz#447b5406b45c8c436c461abea4474d6a849ed975" - integrity sha512-9JFKuW7U+1vPO86k3+XRtJyooiVZsVOsFFO4GulBzepi3a0ckNyPgyjUY1saLH+cEHx18hu8fGgajvI8ANUF2g== +"@sentry/core@5.19.2": + version "5.19.2" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.19.2.tgz#99a64ef0e55230fc02a083c48fa07ada85de4929" + integrity sha512-sfbBsVXpA0WYJUichz5IhvqKD8xJUfQvsszrTsUKa7PQAMAboOmuh6bo8KquaVQnAZyZWZU08UduvlSV3tA7tw== dependencies: - "@sentry/hub" "5.25.0" - "@sentry/types" "5.25.0" + "@sentry/hub" "5.19.2" + "@sentry/minimal" "5.19.2" + "@sentry/types" "5.19.2" + "@sentry/utils" "5.19.2" tslib "^1.9.3" -"@sentry/node@^5.19.2": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.25.0.tgz#f3c3300e1d8d77025fadac02ede4f4da7a037c73" - integrity sha512-zxoUVdAFTeK9kdEGY95TMs6g8Zx/P55HxG4gHD80BG/XIEvWiGPcGCLOspO4IdGqYXkGS74KfBOIXmmCawWwLg== +"@sentry/hub@5.19.2": + version "5.19.2" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.19.2.tgz#ab7f3d2d253c3441b2833a530b17c6de2418b2c7" + integrity sha512-2KkEYX4q9TDCOiaVEo2kQ1W0IXyZxJxZtIjDdFQyes9T4ubYlKHAbvCjTxHSQv37lDO4t7sOIApWG9rlkHzlEA== dependencies: - "@sentry/core" "5.25.0" - "@sentry/hub" "5.25.0" - "@sentry/tracing" "5.25.0" - "@sentry/types" "5.25.0" - "@sentry/utils" "5.25.0" - cookie "^0.4.1" + "@sentry/types" "5.19.2" + "@sentry/utils" "5.19.2" + tslib "^1.9.3" + +"@sentry/minimal@5.19.2": + version "5.19.2" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.19.2.tgz#0fc2fdf9911a0cb31b52f7ccad061b74785724a3" + integrity sha512-rApEOkjy+ZmkeqEItgFvUFxe5l+dht9AumuUzq74pWp+HJqxxv9IVTusKppBsE1adjtmyhwK4O3Wr8qyc75xlw== + dependencies: + "@sentry/hub" "5.19.2" + "@sentry/types" "5.19.2" + tslib "^1.9.3" + +"@sentry/node@5.19.2": + version "5.19.2" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.19.2.tgz#8c1c2f6c983c3d8b25143e5b99c4b6cc745125ec" + integrity sha512-gbww3iTWkdvYIAhOmULbv8znKwkIpklGJ0SPtAh0orUMuaa0lVht+6HQIhRgeXp50lMzNaYC3fuzkbFfYgpS7A== + dependencies: + "@sentry/apm" "5.19.2" + "@sentry/core" "5.19.2" + "@sentry/hub" "5.19.2" + "@sentry/types" "5.19.2" + "@sentry/utils" "5.19.2" + cookie "^0.3.1" https-proxy-agent "^5.0.0" lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/tracing@5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-5.25.0.tgz#1cfbcf085a7a3b679f417058d09590298ddaa255" - integrity sha512-KcyHEGFpqSDubHrdWT/vF2hKkjw/ts6NpJ6tPDjBXUNz98BHdAyMKtLOFTCeJFply7/s5fyiAYu44M+M6IG3Bw== - dependencies: - "@sentry/hub" "5.25.0" - "@sentry/minimal" "5.25.0" - "@sentry/types" "5.25.0" - "@sentry/utils" "5.25.0" - tslib "^1.9.3" +"@sentry/types@5.19.2": + version "5.19.2" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.19.2.tgz#ead586f0b64b91c396d3521b938ca25f7b59d655" + integrity sha512-O6zkW8oM1qK5Uma9+B/UMlmlm9/gkw9MooqycWuEhIaKfDBj/yVbwb/UTiJmNkGc5VJQo0v1uXUZZQt6/Xq1GA== -"@sentry/types@5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.25.0.tgz#3bcf95e118d655d3f4e8bfa5f0be2e1fe4ea5307" - integrity sha512-8M4PREbcar+15wrtEqcwfcU33SS+2wBSIOd/NrJPXJPTYxi49VypCN1mZBDyWkaK+I+AuQwI3XlRPCfsId3D1A== - -"@sentry/utils@5.25.0": - version "5.25.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.25.0.tgz#b132034be66d7381d30879d2a9e09216fed28342" - integrity sha512-Hz5spdIkMSRH5NR1YFOp5qbsY5Ud2lKhEQWlqxcVThMG5YNUc10aYv5ijL19v0YkrC2rqPjCRm7GrVtzOc7bXQ== +"@sentry/utils@5.19.2": + version "5.19.2" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.19.2.tgz#f2819d9de5abc33173019e81955904247e4a8246" + integrity sha512-gEPkC0CJwvIWqcTcPSdIzqJkJa9N5vZzUZyBvdu1oiyJu7MfazpJEvj3whfJMysSfXJQxoJ+a1IPrA73VY23VA== dependencies: - "@sentry/types" "5.25.0" + "@sentry/types" "5.19.2" tslib "^1.9.3" "@sindresorhus/is@^0.14.0": @@ -1007,7 +1049,7 @@ "@types/node" "*" safe-buffer "*" -"@types/semver@^7.3.1": +"@types/semver@^7.1.0": version "7.3.4" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb" integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ== @@ -1083,6 +1125,14 @@ abstract-leveldown@~2.7.1: dependencies: xtend "~4.0.0" +abstract-leveldown@~6.0.0: + version "6.0.3" + resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.0.3.tgz#b4b6159343c74b0c5197b2817854782d8f748c4a" + integrity sha512-jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q== + dependencies: + level-concat-iterator "~2.0.0" + xtend "~4.0.0" + abstract-leveldown@~6.2.1, abstract-leveldown@~6.2.3: version "6.2.3" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz#036543d87e3710f2528e47040bc3261b77a9a8eb" @@ -1162,7 +1212,7 @@ agent-base@6: dependencies: debug "4" -airtable@^0.10.1: +airtable@0.10.1: version "0.10.1" resolved "https://registry.yarnpkg.com/airtable/-/airtable-0.10.1.tgz#0b311002bb44b39f19bf7c4bd2d47d75c733bf87" integrity sha512-obFW+R3ly2mKtCj0D/xto0ggUvYwdM0RJT3VJ9wvgqoxDkzqg2mNtkuTNfYjF6wWQA0GvoHG9guqzgBBqFjItw== @@ -1471,7 +1521,7 @@ any-base@^1.1.0: resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe" integrity sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg== -any-promise@^1.1.0: +any-promise@^1.0.0, any-promise@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= @@ -1525,7 +1575,7 @@ app-builder-lib@22.9.1: semver "^7.3.2" temp-file "^3.3.7" -arangojs@^7.2.0: +arangojs@7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/arangojs/-/arangojs-7.2.0.tgz#e576926b4b3469c5a130cceba45fada8b5f015d1" integrity sha512-9mQRCcttaG0lckapNF9TA71ZU7H2ATXK2a1w+0fj+Y4TlTP1bNDMIz3ZN+EnaSgEtwVu0rb6N6Ac97Yd56GmkQ== @@ -1715,13 +1765,20 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428" integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA== -axios@^0.19.0, axios@^0.19.2: +axios@^0.19.0: version "0.19.2" resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27" integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA== dependencies: follow-redirects "1.5.10" +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== + dependencies: + follow-redirects "^1.10.0" + babel-jest@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54" @@ -1800,7 +1857,7 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -bcryptjs@^2.4.3: +bcryptjs@2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms= @@ -1978,6 +2035,11 @@ buffer-fill@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= +buffer-from@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04" + integrity sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ== + buffer-from@1.1.1, buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -2005,6 +2067,14 @@ buffer@^5.1.0, buffer@^5.2.0, buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0: base64-js "^1.0.2" ieee754 "^1.1.4" +builder-util-runtime@8.7.0: + version "8.7.0" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.0.tgz#e48ad004835c8284662e8eaf47a53468c66e8e8d" + integrity sha512-G1AqqVM2vYTrSFR982c1NNzwXKrGLQjVjaZaWQdn4O6Z3YKjdMDofw88aD9jpyK9ZXkrCxR0tI3Qe9wNbyTlXg== + dependencies: + debug "^4.1.1" + sax "^1.2.4" + builder-util-runtime@8.7.2: version "8.7.2" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72" @@ -2139,7 +2209,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.1.0: +chalk@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== @@ -2152,7 +2222,7 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== -chmodr@^1.2.0: +chmodr@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/chmodr/-/chmodr-1.2.0.tgz#720e96caa09b7f1cdbb01529b7d0ab6bc5e118b9" integrity sha512-Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA== @@ -2396,23 +2466,23 @@ convert-source-map@^1.4.0, convert-source-map@^1.7.0: dependencies: safe-buffer "~5.1.1" -cookie@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" - integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== +cookie@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" + integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= cookiejar@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA== -cookies@~0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90" - integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow== +cookies@~0.7.1: + version "0.7.3" + resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.7.3.tgz#7912ce21fbf2e8c2da70cf1c3f351aecf59dadfa" + integrity sha512-+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A== dependencies: - depd "~2.0.0" - keygrip "~1.1.0" + depd "~1.1.2" + keygrip "~1.0.3" copy-descriptor@^0.1.0: version "0.1.1" @@ -2436,16 +2506,6 @@ crc@^3.4.4: dependencies: buffer "^5.1.0" -create-frame@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/create-frame/-/create-frame-1.0.0.tgz#8b95f2691e3249b6080443e33d0bad9f8f6975aa" - integrity sha1-i5XyaR4ySbYIBEPjPQutn49pdao= - dependencies: - define-property "^0.2.5" - extend-shallow "^2.0.1" - isobject "^3.0.0" - lazy-cache "^2.0.2" - cross-spawn@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" @@ -2482,7 +2542,7 @@ cssstyle@^1.0.0: dependencies: cssom "0.3.x" -csvtojson@^2.0.10: +csvtojson@2.0.10: version "2.0.10" resolved "https://registry.yarnpkg.com/csvtojson/-/csvtojson-2.0.10.tgz#11e7242cc630da54efce7958a45f443210357574" integrity sha512-lUWFxGKyhraKCW8Qghz6Z0f2l/PqB1W3AO0HKJzGIQ5JRSlR651ekJDiGJbBT4sRNNv5ddnSGVEnsxP9XRCVpQ== @@ -2524,6 +2584,11 @@ dateformat@^3.0.3: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== +dayjs@^1.10.4: + version "1.10.4" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.4.tgz#8e544a9b8683f61783f570980a8a80eaf54ab1e2" + integrity sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw== + debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: version "4.2.0" resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" @@ -2687,6 +2752,14 @@ defer-to-connect@^1.0.1: resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +deferred-leveldown@~5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-5.1.0.tgz#c21e40641a8e48530255a4ad31371cc7fe76b332" + integrity sha512-PvDY+BT2ONu2XVRgxHb77hYelLtMYxKSGuWuJJdVRXh9ntqx9GYTFJno/SKAz5xcd+yjQwyQeIZrUPjPvA52mg== + dependencies: + abstract-leveldown "~6.0.0" + inherits "^2.0.3" + deferred-leveldown@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz#27a997ad95408b61161aa69bd489b86c71b78058" @@ -2749,7 +2822,7 @@ depd@^1.1.2, depd@~1.1.2: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= -depd@^2.0.0, depd@~2.0.0: +depd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== @@ -2825,7 +2898,7 @@ dotenv-expand@^5.1.0: resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== -dotenv@^8.2.0: +dotenv@8.2.0, dotenv@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== @@ -2835,7 +2908,7 @@ double-ended-queue@2.1.0-0: resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c" integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw= -download@^8.0.0: +download@8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/download/-/download-8.0.0.tgz#afc0b309730811731aae9f5371c9f46be73e51b1" integrity sha512-ASRY5QhDk7FK+XrQtQyvhpDKanLluEEQtWl/J7Lxuf/b+i8RYh997QeXvL85xitrmRKVlx9c7eTrcRdq2GS4eA== @@ -2913,7 +2986,7 @@ electron-builder@^22.9.1: update-notifier "^4.1.1" yargs "^16.0.3" -electron-is-dev@^1.0.1, electron-is-dev@^1.1.0, electron-is-dev@^1.2.0: +electron-is-dev@1.2.0, electron-is-dev@^1.0.1, electron-is-dev@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.2.0.tgz#2e5cea0a1b3ccf1c86f577cee77363ef55deb05e" integrity sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw== @@ -2940,7 +3013,7 @@ electron-publish@22.9.1: lazy-val "^1.0.4" mime "^2.4.6" -electron-unhandled@^3.0.2: +electron-unhandled@3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/electron-unhandled/-/electron-unhandled-3.0.2.tgz#e14a19c830ccf7b6e755191c8e78d23094d25112" integrity sha512-IIqXnM5eNgV7k5sDA/GZ39ygJbpfF3WTArNGQ1TB4AI6ajQuuVztA0M6Mq9uEpmTh5gz4nR+YsTNWYsHLoM5rw== @@ -2950,20 +3023,20 @@ electron-unhandled@^3.0.2: ensure-error "^2.0.0" lodash.debounce "^4.0.8" -electron-updater@^4.3.1: - version "4.3.5" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.3.5.tgz#4fb36f593a031c87ea07ee141c9f064d5deffb15" - integrity sha512-5jjN7ebvfj1cLI0VZMdCnJk6aC4bP+dy7ryBf21vArR0JzpRVk0OZHA2QBD+H5rm6ZSeDYHOY6+8PrMEqJ4wlQ== +electron-updater@4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.3.1.tgz#9d485b6262bc56fcf7ee62b1dc1b3b105a3e96a7" + integrity sha512-UDC5AHCgeiHJYDYWZG/rsl1vdAFKqI/Lm7whN57LKAk8EfhTewhcEHzheRcncLgikMcQL8gFo1KeX51tf5a5Wg== dependencies: - "@types/semver" "^7.3.1" - builder-util-runtime "8.7.2" - fs-extra "^9.0.1" - js-yaml "^3.14.0" + "@types/semver" "^7.1.0" + builder-util-runtime "8.7.0" + fs-extra "^9.0.0" + js-yaml "^3.13.1" lazy-val "^1.0.4" lodash.isequal "^4.5.0" - semver "^7.3.2" + semver "^7.1.3" -electron-util@^0.14.2: +electron-util@0.14.2: version "0.14.2" resolved "https://registry.yarnpkg.com/electron-util/-/electron-util-0.14.2.tgz#793ebd61f75435363b0dbbba61dddb0f17812fb1" integrity sha512-pnnRJiWajDcTtEAS33RgP3XVO+9cJjOlBA0BKk6cABjcPxihgCwiGWplCOHc0lH43f68ZJZweiunwomJC+TWng== @@ -3048,6 +3121,11 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +error-inject@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/error-inject/-/error-inject-1.0.0.tgz#e2b3d91b54aed672f309d950d154850fa11d4f37" + integrity sha1-4rPZG1Su1nLzCdlQ0VSFD6EdTzc= + error-symbol@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/error-symbol/-/error-symbol-0.1.0.tgz#0a4dae37d600d15a29ba453d8ef920f1844333f6" @@ -3149,6 +3227,11 @@ es3ify@^0.2.2: jstransform "~11.0.0" through "~2.3.4" +es6-denodeify@^0.1.1: + version "0.1.5" + resolved "https://registry.yarnpkg.com/es6-denodeify/-/es6-denodeify-0.1.5.tgz#31d4d5fe9c5503e125460439310e16a2a3f39c1f" + integrity sha1-MdTV/pxVA+ElRgQ5MQ4WoqPznB8= + es6-error@^4.0.1, es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" @@ -3551,6 +3634,14 @@ fetch-cookie@0.10.1: dependencies: tough-cookie "^2.3.3 || ^3.0.1 || ^4.0.0" +fetch-cookie@0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.7.3.tgz#b8d023f421dd2b2f4a0eca9cd7318a967ed4eed8" + integrity sha512-rZPkLnI8x5V+zYAiz8QonAHsTb4BY+iFowFBI1RFn0zrO343AVp9X7/yUj/9wL6Ef/8fLls8b/vGtzUvmyAUGA== + dependencies: + es6-denodeify "^0.1.1" + tough-cookie "^2.3.3" + figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -3658,7 +3749,7 @@ find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -fix-path@^3.0.0: +fix-path@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/fix-path/-/fix-path-3.0.0.tgz#c6b82fd5f5928e520b392a63565ebfef0ddf037e" integrity sha512-opGAl4+ip5jUikHR2C8Jo7czZ80pz8EK/0gMlAZu7xgDmBqIynlX8SMYg9KowYjAU6HT0nxsSJEWru0u+n+N2Q== @@ -3691,6 +3782,11 @@ follow-redirects@1.5.10: dependencies: debug "=3.1.0" +follow-redirects@^1.10.0: + version "1.13.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147" + integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== + for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -3766,7 +3862,7 @@ fs-exists-sync@^0.1.0: resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0= -fs-extra@^8.1.0: +fs-extra@8.1.0, fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== @@ -3775,6 +3871,16 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^9.0.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^9.0.1: version "9.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" @@ -4041,48 +4147,6 @@ gulp-header@^1.7.1: lodash.template "^4.4.0" through2 "^2.0.0" -handlebars-helper-create-frame@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/handlebars-helper-create-frame/-/handlebars-helper-create-frame-0.1.0.tgz#8aa51d10aeb6408fcc6605d40d77356288487a03" - integrity sha1-iqUdEK62QI/MZgXUDXc1YohIegM= - dependencies: - create-frame "^1.0.0" - isobject "^3.0.0" - -handlebars-helpers@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/handlebars-helpers/-/handlebars-helpers-0.10.0.tgz#663d49e718928eafbead1473419ed7bc24bcd45a" - integrity sha512-QiyhQz58u/DbuV41VnfpE0nhy6YCH4vB514ajysV8SoKmP+DxU+pR+fahVyNECHj+jiwEN2VrvxD/34/yHaLUg== - dependencies: - arr-flatten "^1.1.0" - array-sort "^0.1.4" - create-frame "^1.0.0" - define-property "^1.0.0" - "falsey" "^0.3.2" - for-in "^1.0.2" - for-own "^1.0.0" - get-object "^0.2.0" - get-value "^2.0.6" - handlebars "^4.0.11" - handlebars-helper-create-frame "^0.1.0" - handlebars-utils "^1.0.6" - has-value "^1.0.0" - helper-date "^1.0.1" - helper-markdown "^1.0.0" - helper-md "^0.2.2" - html-tag "^2.0.0" - is-even "^1.0.0" - is-glob "^4.0.0" - is-number "^4.0.0" - kind-of "^6.0.0" - lazy-cache "^2.0.2" - logging-helpers "^1.0.0" - micromatch "^3.1.4" - relative "^3.0.2" - striptags "^3.1.0" - to-gfm-code-block "^0.1.1" - year "^0.2.1" - handlebars-utils@^1.0.2, handlebars-utils@^1.0.4, handlebars-utils@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" @@ -4285,7 +4349,7 @@ http-errors@1.7.3, http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-errors@^1.6.3, http-errors@^1.7.3: +http-errors@^1.3.1, http-errors@^1.6.3, http-errors@^1.7.3: version "1.8.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507" integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A== @@ -4364,16 +4428,16 @@ image-q@^1.1.1: resolved "https://registry.yarnpkg.com/image-q/-/image-q-1.1.1.tgz#fc84099664460b90ca862d9300b6bfbbbfbf8056" integrity sha1-/IQJlmRGC5DKhi2TALa/u7+/gFY= +immediate@3.0.6, immediate@~3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= + immediate@3.3.0, immediate@^3.2.3: version "3.3.0" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266" integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q== -immediate@~3.0.5: - version "3.0.6" - resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" - integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= - import-fresh@^3.0.0: version "3.2.1" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" @@ -4475,6 +4539,11 @@ invariant@^2.2.4: dependencies: loose-envify "^1.0.0" +invert-kv@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" + integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== + is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -5303,7 +5372,7 @@ jest@^24.8.0: import-local "^2.0.0" jest-cli "^24.9.0" -jimp@^0.16.1: +jimp@0.16.1: version "0.16.1" resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.16.1.tgz#192f851a30e5ca11112a3d0aa53137659a78ca7a" integrity sha512-+EKVxbR36Td7Hfd23wKGIeEyHbxShZDX6L8uJkgVW3ESA9GiTEPK08tG1XI2r/0w5Ch0HyJF5kPqF9K7EmGjaw== @@ -5319,7 +5388,7 @@ jmespath@0.15.0, jmespath@^0.15.0: resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= -joi@^17.2.1: +joi@17.2.1: version "17.2.1" resolved "https://registry.yarnpkg.com/joi/-/joi-17.2.1.tgz#e5140fdf07e8fecf9bc977c2832d1bdb1e3f2a0a" integrity sha512-YT3/4Ln+5YRpacdmfEfrrKh50/kkgX3LgBltjqnlMPIYiZ4hxXZuVJcxmsvxsdeHg9soZfE3qXxHC2tMpCCBOA== @@ -5458,12 +5527,12 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsonschema@^1.4.0: +jsonschema@1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.0.tgz#1afa34c4bc22190d8e42271ec17ac8b3404f87b2" integrity sha512-/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw== -jsonwebtoken@^8.5.1: +jsonwebtoken@8.5.1: version "8.5.1" resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d" integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w== @@ -5526,12 +5595,10 @@ jws@3.x.x, jws@^3.2.2: jwa "^1.4.1" safe-buffer "^5.0.1" -keygrip@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226" - integrity sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ== - dependencies: - tsscmp "1.0.6" +keygrip@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.0.3.tgz#399d709f0aed2bab0a059e0cdd3a5023a053e1dc" + integrity sha512-/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g== keyv@3.0.0: version "3.0.0" @@ -5576,7 +5643,7 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -koa-body@^4.2.0: +koa-body@4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/koa-body/-/koa-body-4.2.0.tgz#37229208b820761aca5822d14c5fc55cee31b26f" integrity sha512-wdGu7b9amk4Fnk/ytH8GuWwfs4fsB5iNkY8kZPpgQVb04QZSv85T0M8reb+cJmvLE8cjPYvBzRikD3s6qz8OoA== @@ -5597,7 +5664,7 @@ koa-compose@^4.1.0: resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877" integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw== -koa-compress@^4.0.1: +koa-compress@4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/koa-compress/-/koa-compress-4.0.1.tgz#7a7ed52ce7c3e0cbe918e99e1eaaeba87ec11d48" integrity sha512-It4WYfsBb9HegnFgcBhiRbPeh1LDjXhRM4+xi2jMp8ujwaVAdqhFzHpbDWuTxbLxuBwStn+Bwdwn2zDZxeNChg== @@ -5621,13 +5688,23 @@ koa-is-json@^1.0.0: resolved "https://registry.yarnpkg.com/koa-is-json/-/koa-is-json-1.0.0.tgz#273c07edcdcb8df6a2c1ab7d59ee76491451ec14" integrity sha1-JzwH7c3Ljfaiwat9We52SRRR7BQ= -koa-pino-logger@^3.0.0: +koa-pino-logger@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/koa-pino-logger/-/koa-pino-logger-3.0.0.tgz#27600b4f3639e8767dfc6b66493109c5457f53ba" integrity sha512-teJsT88JLRBYH7pJACGAwAHfl2y/x5u5aSPD03Z/HW6QDMAWyRxk4dsY0/UbtM8wgaXIaxZgIFUxxvgiQFr6WQ== dependencies: pino-http "^5.0.1" +koa-send@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-5.0.0.tgz#5e8441e07ef55737734d7ced25b842e50646e7eb" + integrity sha512-90ZotV7t0p3uN9sRwW2D484rAaKIsD8tAVtypw/aBU+ryfV+fR2xrcAwhI8Wl6WRkojLUs/cB9SBSCuIb+IanQ== + dependencies: + debug "^3.1.0" + http-errors "^1.6.3" + mz "^2.7.0" + resolve-path "^1.4.0" + koa-send@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-5.0.1.tgz#39dceebfafb395d0d60beaffba3a70b4f543fe79" @@ -5637,17 +5714,17 @@ koa-send@^5.0.0: http-errors "^1.7.3" resolve-path "^1.4.0" -koa-session@^5.12.0: - version "5.13.1" - resolved "https://registry.yarnpkg.com/koa-session/-/koa-session-5.13.1.tgz#a47e39015a4b464e21e3e1e2deeca48eb83916ee" - integrity sha512-TfYiun6xiFosyfIJKnEw0aoG5XmLIwM+K3OVWfkz84qY0NP2gbk0F/olRn0/Hrxq0f14s8amHVXeWyKYH3Cx3Q== +koa-session@5.12.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/koa-session/-/koa-session-5.12.0.tgz#1e6c6cea86b8ca2cca921c4a8881cfbfcc2628e0" + integrity sha512-2jBKF6Hp609Qh19NO4jT0Pehmp/49RiX0DetuCvSB6zmx32BRPOdNp6H6873xsvL9CyLGtaSJxvwxmAFBd1viw== dependencies: crc "^3.4.4" debug "^3.1.0" is-type-of "^1.0.0" uuid "^3.3.2" -koa-static@^5.0.0: +koa-static@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/koa-static/-/koa-static-5.0.0.tgz#5e92fc96b537ad5219f425319c95b64772776943" integrity sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ== @@ -5655,21 +5732,21 @@ koa-static@^5.0.0: debug "^3.1.0" koa-send "^5.0.0" -koa@^2.7.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/koa/-/koa-2.13.0.tgz#25217e05efd3358a7e5ddec00f0a380c9b71b501" - integrity sha512-i/XJVOfPw7npbMv67+bOeXr3gPqOAw6uh5wFyNs3QvJ47tUx3M3V9rIE0//WytY42MKz4l/MXKyGkQ2LQTfLUQ== +koa@2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/koa/-/koa-2.7.0.tgz#7e00843506942b9d82c6cc33749f657c6e5e7adf" + integrity sha512-7ojD05s2Q+hFudF8tDLZ1CpCdVZw8JQELWSkcfG9bdtoTDzMmkRF6BQBU7JzIzCCOY3xd3tftiy/loHBUYaY2Q== dependencies: accepts "^1.3.5" cache-content-type "^1.0.0" content-disposition "~0.5.2" content-type "^1.0.4" - cookies "~0.8.0" + cookies "~0.7.1" debug "~3.1.0" delegates "^1.0.0" depd "^1.1.2" destroy "^1.0.4" - encodeurl "^1.0.2" + error-inject "^1.0.0" escape-html "^1.0.3" fresh "~0.5.2" http-assert "^1.3.0" @@ -5677,6 +5754,7 @@ koa@^2.7.0: is-generator-function "^1.0.7" koa-compose "^4.1.0" koa-convert "^1.2.0" + koa-is-json "^1.0.0" on-finished "^2.3.0" only "~0.0.2" parseurl "^1.3.2" @@ -5691,7 +5769,7 @@ latest-version@^5.0.0: dependencies: package-json "^6.3.0" -lazy-cache@^2.0.1, lazy-cache@^2.0.2: +lazy-cache@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264" integrity sha1-uRkKT5EzVGlIQIWfio9whNiCImQ= @@ -5703,11 +5781,23 @@ lazy-val@^1.0.4: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q== +lcid@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" + integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== + dependencies: + invert-kv "^2.0.0" + left-pad@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA== +level-codec@9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-9.0.1.tgz#042f4aa85e56d4328ace368c950811ba802b7247" + integrity sha512-ajFP0kJ+nyq4i6kptSM+mAvJKLOg1X5FiFPtLG9M5gCEZyBmgDi3FkDrvlMkEzrUn1cWxtvVmrvoS4ASyO/q+Q== + level-codec@9.0.2, level-codec@^9.0.0: version "9.0.2" resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-9.0.2.tgz#fd60df8c64786a80d44e63423096ffead63d8cbc" @@ -5768,16 +5858,26 @@ level-write-stream@1.0.0: dependencies: end-stream "~0.1.0" -level@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/level/-/level-6.0.1.tgz#dc34c5edb81846a6de5079eac15706334b0d7cd6" - integrity sha512-psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw== +level@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/level/-/level-6.0.0.tgz#d216fb9b9c3940bcec15c5880d8da775ca086c5c" + integrity sha512-3oAi7gXLLNr7pHj8c4vbI6lHkXf35m8qb7zWMrNTrOax6CXBVggQAwL1xnC/1CszyYrW3BsLXsY5TMgTxtKfFA== dependencies: level-js "^5.0.0" level-packager "^5.1.0" leveldown "^5.4.0" + opencollective-postinstall "^2.0.0" -leveldown@5.6.0, leveldown@^5.4.0: +leveldown@5.4.1: + version "5.4.1" + resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.4.1.tgz#83a8fdd9bb52b1ed69be2ef59822b6cdfcdb51ec" + integrity sha512-3lMPc7eU3yj5g+qF1qlALInzIYnkySIosR1AsUKFjL9D8fYbTLuENBAeDRZXIG4qeWOAyqRItOoLu2v2avWiMA== + dependencies: + abstract-leveldown "~6.2.1" + napi-macros "~2.0.0" + node-gyp-build "~4.1.0" + +leveldown@^5.4.0: version "5.6.0" resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98" integrity sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ== @@ -5786,6 +5886,16 @@ leveldown@5.6.0, leveldown@^5.4.0: napi-macros "~2.0.0" node-gyp-build "~4.1.0" +levelup@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.1.0.tgz#49ab5d3a341731cd102f91c6bc17a1acb1969a17" + integrity sha512-+Qhe2/jb5affN7BeFgWUUWVdYoGXO2nFS3QLEZKZynnQyP9xqA+7wgOz3fD8SST2UKpHQuZgjyJjTcB2nMl2dQ== + dependencies: + deferred-leveldown "~5.1.0" + level-errors "~2.0.0" + level-iterator-stream "~4.0.0" + xtend "~4.0.0" + levelup@4.4.0, levelup@^4.3.2: version "4.4.0" resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" @@ -5976,7 +6086,12 @@ lodash.xor@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6" integrity sha1-TUjtfpgJWwYyWCunFNP/iuj7HbY= -lodash@^4.17.10, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3: +lodash@4.17.13: + version "4.17.13" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93" + integrity sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA== + +lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -6086,6 +6201,13 @@ makeerror@1.0.x: dependencies: tmpl "1.0.x" +map-age-cleaner@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" + integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== + dependencies: + p-defer "^1.0.0" + map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -6110,6 +6232,15 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= +mem@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" + integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== + dependencies: + map-age-cleaner "^0.1.1" + mimic-fn "^2.0.0" + p-is-promise "^2.0.0" + memdown@1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/memdown/-/memdown-1.4.1.tgz#b4e4e192174664ffbae41361aa500f3119efe215" @@ -6132,7 +6263,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -methods@^1.1.1, methods@^1.1.2: +methods@^1.0.1, methods@^1.1.1, methods@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= @@ -6198,7 +6329,7 @@ mime@^2.4.6: resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== -mimic-fn@^2.1.0: +mimic-fn@^2.0.0, mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== @@ -6252,7 +6383,7 @@ moment@^2.18.1: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== -mongodb@^3.6.3: +mongodb@3.6.3: version "3.6.3" resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.3.tgz#eddaed0cc3598474d7a15f0f2a5b04848489fd05" integrity sha512-rOZuR0QkodZiM+UbQE5kDsJykBqWi0CL4Ec2i1nrGrUI3KO11r6Fbxskqmq3JK2NH7aW4dcccBuUujAP0ERl5w== @@ -6280,7 +6411,7 @@ ms@2.1.2, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -mssql@^6.2.3: +mssql@6.2.3: version "6.2.3" resolved "https://registry.yarnpkg.com/mssql/-/mssql-6.2.3.tgz#1d15bbe8c3057e32ee6e98596b6c323b097a6cba" integrity sha512-4TW/fA9UgzmVTNgjl65r6ISr6aL5QHnlptEt1A3jIpdzkNbFPIkRbUNz90324HIdE+5pKc3VqikOImcTrhd4og== @@ -6307,7 +6438,7 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -mysql@^2.18.1: +mysql@2.18.1: version "2.18.1" resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.18.1.tgz#2254143855c5a8c73825e4522baf2ea021766717" integrity sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig== @@ -6317,6 +6448,15 @@ mysql@^2.18.1: safe-buffer "5.1.2" sqlstring "2.3.1" +mz@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== + dependencies: + any-promise "^1.0.0" + object-assign "^4.0.1" + thenify-all "^1.0.0" + nan@^2.12.1: version "2.14.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" @@ -6389,12 +6529,17 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-fetch@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.4.1.tgz#b2e38f1117b8acbedbe0524f041fb3177188255d" + integrity sha512-P9UbpFK87NyqBZzUuDBDz4f6Yiys8xm8j7ACDbi6usvFm6KItklQUKjeoqTrYS/S1k6I8oaOC2YLLDr/gg26Mw== + node-fetch@2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== -node-fetch@^2.6.0, node-fetch@^2.6.1: +node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== @@ -6624,7 +6769,7 @@ only@~0.0.2: resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4" integrity sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q= -open@^7.3.0: +open@7.3.0: version "7.3.0" resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69" integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw== @@ -6632,6 +6777,11 @@ open@^7.3.0: is-docker "^2.0.0" is-wsl "^2.1.1" +opencollective-postinstall@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" + integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== + optionator@^0.8.1, optionator@^0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -6644,6 +6794,15 @@ optionator@^0.8.1, optionator@^0.8.3: type-check "~0.3.2" word-wrap "~1.2.3" +os-locale@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" + integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== + dependencies: + execa "^1.0.0" + lcid "^2.0.0" + mem "^4.0.0" + os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -6659,6 +6818,11 @@ p-cancelable@^1.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +p-defer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" + integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= + p-each-series@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71" @@ -6683,6 +6847,11 @@ p-is-promise@^1.1.0: resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e" integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4= +p-is-promise@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" + integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== + p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -6829,7 +6998,7 @@ path-parse@^1.0.6: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== -path-to-regexp@1.x: +path-to-regexp@^1.1.1: version "1.8.0" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== @@ -6884,7 +7053,7 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@^8.5.1: +pg@8.5.1: version "8.5.1" resolved "https://registry.yarnpkg.com/pg/-/pg-8.5.1.tgz#34dcb15f6db4a29c702bf5031ef2e1e25a06a120" integrity sha512-9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw== @@ -6950,14 +7119,14 @@ pino-http@^5.0.1: pino "^6.0.0" pino-std-serializers "^2.4.0" -pino-pretty@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-4.3.0.tgz#18695606fd4f1e21cd1585d18999cd84d429e1d8" - integrity sha512-uEc9SUCCGVEs0goZvyznKXBHtI1PNjGgqHviJHxOCEFEWZN6Z/IQKv5pO9gSdm/b+WfX+/dfheWhtZUyScqjlQ== +pino-pretty@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-4.0.0.tgz#afbff81f946342b9d6eabc434942fe490e02faa9" + integrity sha512-YLy/n3dMXYWOodSm530gelkSAJGmEp29L9pqiycInlIae5FEJPWAkMRO3JFMbIFtjD2Ve4SH2aBcz2aRreGpBQ== dependencies: "@hapi/bourne" "^2.0.0" args "^5.0.1" - chalk "^4.0.0" + chalk "^3.0.0" dateformat "^3.0.3" fast-safe-stringify "^2.0.7" jmespath "^0.15.0" @@ -6965,7 +7134,7 @@ pino-pretty@^4.0.0: pump "^3.0.0" readable-stream "^3.6.0" split2 "^3.1.1" - strip-json-comments "^3.1.1" + strip-json-comments "^3.0.1" pino-std-serializers@^2.4.0, pino-std-serializers@^2.4.2: version "2.5.0" @@ -7105,7 +7274,7 @@ pouchdb-adapter-utils@7.2.2: pouchdb-merge "7.2.2" pouchdb-utils "7.2.2" -pouchdb-all-dbs@^1.0.2: +pouchdb-all-dbs@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pouchdb-all-dbs/-/pouchdb-all-dbs-1.0.2.tgz#8fa1aa4b01665e00e0da9c61bf6dbb99eca05d3c" integrity sha1-j6GqSwFmXgDg2pxhv227meygXTw= @@ -7206,7 +7375,7 @@ pouchdb-promise@^6.0.4: dependencies: lie "3.1.1" -pouchdb-replication-stream@^1.2.9: +pouchdb-replication-stream@1.2.9: version "1.2.9" resolved "https://registry.yarnpkg.com/pouchdb-replication-stream/-/pouchdb-replication-stream-1.2.9.tgz#aa4fa5d8f52df4825392f18e07c7e11acffc650a" integrity sha1-qk+l2PUt9IJTkvGOB8fhGs/8ZQo= @@ -7241,30 +7410,30 @@ pouchdb-utils@7.2.2: pouchdb-md5 "7.2.2" uuid "8.1.0" -pouchdb@^7.2.1: - version "7.2.2" - resolved "https://registry.yarnpkg.com/pouchdb/-/pouchdb-7.2.2.tgz#fcae82862db527e4cf7576ed8549d1384961f364" - integrity sha512-5gf5nw5XH/2H/DJj8b0YkvG9fhA/4Jt6kL0Y8QjtztVjb1y4J19Rg4rG+fUbXu96gsUrlyIvZ3XfM0b4mogGmw== +pouchdb@7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/pouchdb/-/pouchdb-7.2.1.tgz#619e3d5c2463ddd94a4b1bf40d44408c46e9de79" + integrity sha512-AoDPdr6tFqj3xs7oiD2oioYj5MMu87c3UemRHZ/p++BwU+ZsKn5jpnL09OvWTLvMvaICGAOufiaUzmM1/KKoKQ== dependencies: abort-controller "3.0.0" argsarray "0.0.1" - buffer-from "1.1.1" + buffer-from "1.1.0" clone-buffer "1.0.0" double-ended-queue "2.1.0-0" - fetch-cookie "0.10.1" - immediate "3.3.0" + fetch-cookie "0.7.3" + immediate "3.0.6" inherits "2.0.4" - level "6.0.1" - level-codec "9.0.2" + level "6.0.0" + level-codec "9.0.1" level-write-stream "1.0.0" - leveldown "5.6.0" - levelup "4.4.0" + leveldown "5.4.1" + levelup "4.1.0" ltgt "2.2.1" - node-fetch "2.6.0" - readable-stream "1.1.14" - spark-md5 "3.0.1" - through2 "3.0.2" - uuid "8.1.0" + node-fetch "2.4.1" + readable-stream "1.0.33" + spark-md5 "3.0.0" + through2 "3.0.1" + uuid "3.3.3" vuvuzela "1.0.3" prelude-ls@~1.1.2: @@ -7481,6 +7650,16 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" +readable-stream@1.0.33: + version "1.0.33" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.33.tgz#3a360dd66c1b1d7fd4705389860eda1d0f61126c" + integrity sha1-OjYN1mwbHX/UcFOJhg7aHQ9hEmw= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readable-stream@1.1.14, readable-stream@^1.0.27-1: version "1.1.14" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" @@ -7851,7 +8030,7 @@ sanitize-filename@^1.6.2, sanitize-filename@^1.6.3: dependencies: truncate-utf8-bytes "^1.0.0" -sanitize-s3-objectkey@^0.0.1: +sanitize-s3-objectkey@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e" integrity sha512-ZTk7aqLxy4sD40GWcYWoLfbe05XLmkKvh6vGKe13ADlei24xlezcvjgKy1qRArlaIbIMYaqK7PCalvZtulZlaQ== @@ -7912,6 +8091,13 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.1.3: + version "7.3.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" + integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + dependencies: + lru-cache "^6.0.0" + semver@^7.3.2: version "7.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" @@ -7924,7 +8110,7 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" -server-destroy@^1.0.1: +server-destroy@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd" integrity sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0= @@ -8146,6 +8332,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +spark-md5@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.0.tgz#3722227c54e2faf24b1dc6d933cc144e6f71bfef" + integrity sha1-NyIifFTi+vJLHcbZM8wUTm9xv+8= + spark-md5@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.1.tgz#83a0e255734f2ab4e5c466e5a2cfc9ba2aa2124d" @@ -8402,7 +8593,7 @@ strip-eof@^1.0.0: resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= -strip-json-comments@^3.0.1, strip-json-comments@^3.1.1: +strip-json-comments@^3.0.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== @@ -8498,10 +8689,10 @@ svelte-spa-router@^3.0.5: dependencies: regexparam "1.3.0" -svelte@^3.30.0: - version "3.31.2" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.31.2.tgz#d2ddf6cacbb95e4cc3796207510b660a25586324" - integrity sha512-TxZGrXzX2ggFH3BIKY5fmbeMdJuZrMIMDYPMX6R9255bueuYIuVaBQSLUeY2oD7W4IdeqRZiAVGCjDw2POKBRA== +svelte@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.30.0.tgz#cbde341e96bf34f4ac73c8f14f8a014e03bfb7d6" + integrity sha512-z+hdIACb9TROGvJBQWcItMtlr4s0DBUgJss6qWrtFkOoIInkG+iAMo/FJZQFyDBQZc+dul2+TzYSi/tpTT5/Ag== symbol-tree@^3.2.2: version "3.2.4" @@ -8518,7 +8709,7 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -tar-fs@^2.1.0: +tar-fs@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.0.tgz#d1cdd121ab465ee0eb9ccde2d35049d3f3daf0d5" integrity sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg== @@ -8602,11 +8793,32 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= +thenify-all@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= + dependencies: + thenify ">= 3.1.0 < 4" + +"thenify@>= 3.1.0 < 4": + version "3.3.1" + resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" + integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== + dependencies: + any-promise "^1.0.0" + throat@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= +through2@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a" + integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww== + dependencies: + readable-stream "2 || 3" + through2@3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" @@ -8688,7 +8900,7 @@ to-gfm-code-block@^0.1.1: resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" integrity sha1-JdBFpfrlUxielje1kJANpzLYqoI= -to-json-schema@^0.2.5: +to-json-schema@0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/to-json-schema/-/to-json-schema-0.2.5.tgz#ef3c3f11ad64460dcfbdbafd0fd525d69d62a98f" integrity sha512-jP1ievOee8pec3tV9ncxLSS48Bnw7DIybgy112rhMCEhf3K4uyVNZZHr03iQQBzbV5v5Hos+dlZRRyk6YSMNDw== @@ -8792,11 +9004,6 @@ tslib@^1.9.0, tslib@^1.9.2, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tsscmp@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb" - integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA== - tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" @@ -8920,6 +9127,11 @@ universalify@^1.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== +universalify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== + unpipe@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -8968,7 +9180,7 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -urijs@^1.19.2: +urijs@^1.19.0: version "1.19.5" resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.5.tgz#119683ab4b2fb0bd637e5ea6dd9117bcac68d3e4" integrity sha512-48z9VGWwdCV5KfizHsE05DWS5fhK6gFlx5MjO7xu0Krc5FGPWzjlXEVV0nPMrdVuP7xmMHiPZ2HoYZwKOFTZOg== @@ -9035,6 +9247,11 @@ uuid@3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== +uuid@3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866" + integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ== + uuid@8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d" @@ -9058,7 +9275,7 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -validate.js@^0.13.1: +validate.js@0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/validate.js/-/validate.js-0.13.1.tgz#b58bfac04a0f600a340f62e5227e70d95971e92a" integrity sha512-PnFM3xiZ+kYmLyTiMgTYmU7ZHkjBZz2/+F0DaALc/uUtVzdCt1wAosvYJ5hFQi/hz8O4zb52FQhHZRC+uVkJ+g== @@ -9199,7 +9416,7 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= -worker-farm@^1.7.0: +worker-farm@1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== @@ -9370,7 +9587,7 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@^13.1.2: +yargs-parser@^13.1.0, yargs-parser@^13.1.2: version "13.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== @@ -9383,7 +9600,24 @@ yargs-parser@^20.2.2: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== -yargs@^13.2.4, yargs@^13.3.0: +yargs@13.2.4: + version "13.2.4" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83" + integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg== + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + os-locale "^3.1.0" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.0" + +yargs@^13.3.0: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== @@ -9430,7 +9664,7 @@ ylru@^1.2.0: resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.2.1.tgz#f576b63341547989c1de7ba288760923b27fe84f" integrity sha512-faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ== -zlib@^1.0.5: +zlib@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" integrity sha1-bnyXL8NxxkWmr7A6sUdp3vEU/MA= diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json index ccc03899cc..38a9429fc7 100644 --- a/packages/standard-components/manifest.json +++ b/packages/standard-components/manifest.json @@ -214,18 +214,8 @@ }, { "type": "text", - "label": "Text 1", - "key": "text1" - }, - { - "type": "text", - "label": "Text 2", - "key": "text2" - }, - { - "type": "text", - "label": "Text 3", - "key": "text3" + "label": "Subheading", + "key": "subheading" }, { "type": "screen", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index 767ac30c0e..8a6652341a 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -34,9 +34,9 @@ "keywords": [ "svelte" ], - "version": "0.6.2", + "version": "0.7.4", "license": "MIT", - "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491", + "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd", "dependencies": { "@budibase/bbui": "^1.55.1", "@budibase/svelte-ag-grid": "^0.0.16", diff --git a/packages/standard-components/src/Navigation.svelte b/packages/standard-components/src/Navigation.svelte index 4a4ec8dccc..192beaf74e 100644 --- a/packages/standard-components/src/Navigation.svelte +++ b/packages/standard-components/src/Navigation.svelte @@ -60,13 +60,18 @@ .nav__menu { display: flex; margin-top: 40px; - gap: 16px; flex-direction: row; justify-content: flex-start; align-items: center; } - .nav__menu > a { + + .nav__menu > * { + margin-right: 16px; + } + + :global(.nav__menu > a) { font-size: 1.5em; text-decoration: none; + margin-right: 16px; } diff --git a/packages/standard-components/src/StackedList.svelte b/packages/standard-components/src/StackedList.svelte index f7644a4e41..b06ce53ebe 100644 --- a/packages/standard-components/src/StackedList.svelte +++ b/packages/standard-components/src/StackedList.svelte @@ -6,9 +6,7 @@ export let imageUrl = "" export let heading = "" - export let text1 = "" - export let text2 = "" - export let text3 = "" + export let subheading = "" export let destinationUrl = "" $: showImage = !!imageUrl @@ -16,16 +14,16 @@
-
+
{#if showImage}
{/if} -

{heading}

-

{text1}

-

{text2}

-

{text3}

+
+
{heading}
+
{subheading}
+
@@ -34,61 +32,51 @@ a { text-decoration: none; color: inherit; + cursor: pointer; } .container { - padding: 20px; + padding: 1rem 1.5rem; + min-height: 3rem; + display: block; + align-items: flex-start; + } + + .stackedlist { + display: flex; + flex-direction: row; + overflow: hidden; + max-width: 100%; + } + + .subheading { + opacity: 0.6; } .content { - display: grid; - grid-template-columns: 120px 300px 1fr 1fr 1fr; - align-items: center; - gap: 20px; - min-height: 80px; - } - - @media (max-width: 800px) { - .content { - display: grid; - grid-template-columns: 1fr; - gap: 20px; - } - } - .image-block { - width: 80px; - height: 80px; - display: flex; - align-items: center; - justify-content: center; - } - - .image { - padding: 2px; - max-width: 80px; - max-height: 80px; - margin-right: 20px; + min-width: 0; + max-width: 100%; + flex: 1 1 auto; } .heading { - font-size: 24px; - margin: 0; - min-width: 200px; + font-weight: 600; } - .text { - font-size: 16px; - font-weight: 400; + .image-block { + display: flex; + flex: 0 0 auto; + margin-right: 1.5rem; + color: inherit; + text-decoration: none; } - .text3 { - text-align: end; - font-size: 16px; - font-weight: 400; - } - - @media (max-width: 800px) { - .text3 { - text-align: start; - } + .image { + display: block; + overflow: hidden; + width: 3rem; + max-width: 100%; + -webkit-user-select: none; + user-select: none; + border-radius: 99px; } diff --git a/packages/standard-components/yarn.lock b/packages/standard-components/yarn.lock index 8b4ffdcf3e..3ea980fc71 100644 --- a/packages/standard-components/yarn.lock +++ b/packages/standard-components/yarn.lock @@ -40,9 +40,9 @@ to-fast-properties "^2.0.0" "@budibase/bbui@^1.55.1": - version "1.55.1" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.55.1.tgz#291fb6fa10479b49f078d3a911ad0ed42c2e6b12" - integrity sha512-bxsHBwkOqCtuFz89e0hAXwvwycfS4xPPrEge5PxK1Lh3uqetO4bXoIxYaIDjfi2Ku7CYIzEmOwSloNaQWeTF4g== + version "1.56.2" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.56.2.tgz#bb8f7d9b9b5ed06a22df877fbe028780d7602471" + integrity sha512-cWYkT1FNwNGTjisxtC5/MlQ1zeu7MYbMJsD6UyCEW3Ku6JIQZ6jyOkV6HKrmNND8VzVfddEGpzR37q+NoDpDFQ== dependencies: markdown-it "^12.0.2" quill "^1.3.7" @@ -1034,7 +1034,12 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -flatpickr@^4.5.2, flatpickr@^4.6.6: +flatpickr@^4.5.2: + version "4.6.9" + resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.9.tgz#9a13383e8a6814bda5d232eae3fcdccb97dc1499" + integrity sha512-F0azNNi8foVWKSF+8X+ZJzz8r9sE1G4hl06RyceIaLvyltKvDl6vqk9Lm/6AUUCi5HWaIjiUbk7UpeE/fOXOpw== + +flatpickr@^4.6.6: version "4.6.6" resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.6.tgz#34d2ad80adfa34254e62583a34264d472f1038d6" integrity sha512-EZ48CJMttMg3maMhJoX+GvTuuEhX/RbA1YeuI19attP3pwBdbYy6+yqAEVm0o0hSBFYBiLbVxscLW6gJXq6H3A== @@ -1558,9 +1563,9 @@ loader-utils@^1.1.0: json5 "^1.0.1" local-access@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/local-access/-/local-access-1.0.1.tgz#5121258146d64e869046c642ea4f1dd39ff942bb" - integrity sha512-ykt2pgN0aqIy6KQC1CqdWTWkmUwNgaOS6dcpHVjyBJONA+Xi7AtSB1vuxC/U/0tjIP3wcRudwQk1YYzUvzk2bA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/local-access/-/local-access-1.1.0.tgz#e007c76ba2ca83d5877ba1a125fc8dfe23ba4798" + integrity sha512-XfegD5pyTAfb+GY6chk283Ox5z8WexG56OvM06RWLpAc/UHozO8X6xAxEkIitZOtsSMM1Yr3DkHgW5W+onLhCw== lodash.camelcase@^4.3.0: version "4.3.0" @@ -1648,9 +1653,9 @@ miller-rabin@^4.0.0: brorand "^1.0.1" mime@^2.3.1: - version "2.4.6" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" - integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== + version "2.5.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1" + integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag== minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" @@ -2481,9 +2486,9 @@ rollup@^2.11.2: fsevents "~2.1.2" sade@^1.4.0: - version "1.7.3" - resolved "https://registry.yarnpkg.com/sade/-/sade-1.7.3.tgz#a217ccc4fb4abb2d271648bf48f6628b2636fa1b" - integrity sha512-m4BctppMvJ60W1dXnHq7jMmFe3hPJZDAH85kQ3ACTo7XZNVUuTItCQ+2HfyaMeV5cKrbw7l4vD/6We3GBxvdJw== + version "1.7.4" + resolved "https://registry.yarnpkg.com/sade/-/sade-1.7.4.tgz#ea681e0c65d248d2095c90578c03ca0bb1b54691" + integrity sha512-y5yauMD93rX840MwUJr7C1ysLFBgMspsdTo4UVrDg3fXDvtwOyIqykhVAAm6fk/3au77773itJStObgK+LKaiA== dependencies: mri "^1.1.0" diff --git a/packages/string-templates/README.md b/packages/string-templates/README.md index d9433b387b..b2a1ce476e 100644 --- a/packages/string-templates/README.md +++ b/packages/string-templates/README.md @@ -2,26 +2,30 @@ This package provides a common system for string templating across the Budibase Builder, client and server. The templating is provided through the use of [Handlebars](https://handlebarsjs.com/) an extension of Mustache which is capable of carrying out logic. We have also extended the base Handlebars functionality through the use -of a set of helpers provided through the [handlebars-helpers](https://github.com/helpers/handlebars-helpers) package. +of a set of helpers provided through the [handlebars-helpers](https://github.com/budibase/handlebars-helpers) package. We have not implemented all the helpers provided by the helpers package as some of them provide functionality we felt would not be beneficial. The following collections of helpers have been implemented: -1. [Math](https://github.com/helpers/handlebars-helpers/tree/master#math) - a set of useful helpers for +1. [Math](https://github.com/budibase/handlebars-helpers/tree/master#math) - a set of useful helpers for carrying out logic pertaining to numbers e.g. `avg`, `add`, `abs` and so on. -2. [Array](https://github.com/helpers/handlebars-helpers/tree/master#array) - some very specific helpers +2. [Array](https://github.com/budibase/handlebars-helpers/tree/master#array) - some very specific helpers for use with arrays, useful for example in automations. Helpers like `first`, `last`, `after` and `join` can be useful for getting particular portions of arrays or turning them into strings. -3. [Number](https://github.com/helpers/handlebars-helpers/tree/master#number) - unlike the math helpers these +3. [Number](https://github.com/budibase/handlebars-helpers/tree/master#number) - unlike the math helpers these are useful for converting numbers into useful formats for display, e.g. `bytes`, `addCommas` and `toPrecision`. -4. [URL](https://github.com/helpers/handlebars-helpers/tree/master#url) - very specific helpers for dealing with URLs, +4. [URL](https://github.com/budibase/handlebars-helpers/tree/master#url) - very specific helpers for dealing with URLs, such as `encodeURI`, `escape`, `stripQueryString` and `stripProtocol`. These are primarily useful for building up particular URLs to hit as say part of an automation. -5. [String](https://github.com/helpers/handlebars-helpers/tree/master#string) - these helpers are useful for building +5. [String](https://github.com/budibase/handlebars-helpers/tree/master#string) - these helpers are useful for building strings and preparing them for display, e.g. `append`, `camelcase`, `capitalize` and `ellipsis`. -6. [Comparison](https://github.com/helpers/handlebars-helpers/tree/master#comparison) - these helpers are mainly for +6. [Comparison](https://github.com/budibase/handlebars-helpers/tree/master#comparison) - these helpers are mainly for building strings when particular conditions are met, for example `and`, `or`, `gt`, `lt`, `not` and so on. This is a very extensive set of helpers but is mostly as would be expected from a set of logical operators. -7. [Date](https://github.com/helpers/helper-date) - last but certainly not least is a moment based date helper, which can +7. [Object](https://github.com/budibase/handlebars-helpers/tree/master#object) - useful operator for parsing objects, as well +as converting them to JSON strings. +8. [Regex](https://github.com/budibase/handlebars-helpers/tree/master#regex) - allows performing regex tests on strings that +can be used in conditional statements. +9. [Date](https://github.com/helpers/helper-date) - last but certainly not least is a moment based date helper, which can format ISO/timestamp based dates into something human-readable. An example of this would be `{{date dateProperty "DD-MM-YYYY"}}`. ## Date formatting diff --git a/packages/string-templates/manifest.json b/packages/string-templates/manifest.json index c23e3dc3a4..5a96885383 100644 --- a/packages/string-templates/manifest.json +++ b/packages/string-templates/manifest.json @@ -5,6 +5,7 @@ "a" ], "numArgs": 1, + "example": "{{ abs 12012.1000 }} -> 12012.1", "description": "

Return the magnitude of a.

\n" }, "add": { @@ -13,6 +14,7 @@ "b" ], "numArgs": 2, + "example": "{{ add 1 2 }} -> 3", "description": "

Return the sum of a plus b.

\n" }, "avg": { @@ -20,7 +22,7 @@ "array" ], "numArgs": 1, - "example": "handlebars {{avg \"[1, 2, 3, 4, 5]\"}} ", + "example": "{{ avg [1,2,3,4,5] }} -> 3", "description": "

Returns the average of all numbers in the given array.

\n" }, "ceil": { @@ -28,6 +30,7 @@ "value" ], "numArgs": 1, + "example": "{{ ceil 1.2 }} -> 2", "description": "

Get the Math.ceil() of the given value.

\n" }, "divide": { @@ -36,6 +39,7 @@ "b" ], "numArgs": 2, + "example": "{{ divide 10 5 }} -> 2", "description": "

Divide a by b

\n" }, "floor": { @@ -43,6 +47,7 @@ "value" ], "numArgs": 1, + "example": "{{ floor 1.2 }} -> 1", "description": "

Get the Math.floor() of the given value.

\n" }, "minus": { @@ -51,6 +56,7 @@ "b" ], "numArgs": 2, + "example": "{{ subtract 10 5 }} -> 5", "description": "

Return the product of a minus b.

\n" }, "modulo": { @@ -59,6 +65,7 @@ "b" ], "numArgs": 2, + "example": "{{ modulo 10 5 }} -> 0", "description": "

Get the remainder of a division operation.

\n" }, "multiply": { @@ -67,6 +74,7 @@ "b" ], "numArgs": 2, + "example": "{{ product 10 5 }} -> 50", "description": "

Return the product of a times b.

\n" }, "plus": { @@ -75,6 +83,7 @@ "b" ], "numArgs": 2, + "example": "{{ plus 10 5 }} -> 15", "description": "

Add a by b.

\n" }, "random": { @@ -83,6 +92,7 @@ "max" ], "numArgs": 2, + "example": "{{ random 0 20 }} -> 10", "description": "

Generate a random number between two values

\n" }, "remainder": { @@ -91,6 +101,7 @@ "b" ], "numArgs": 2, + "example": "{{ remainder 10 6 }} -> 4", "description": "

Get the remainder when a is divided by b.

\n" }, "round": { @@ -98,6 +109,7 @@ "number" ], "numArgs": 1, + "example": "{{ round 10.3 }} -> 10", "description": "

Round the given number.

\n" }, "subtract": { @@ -106,6 +118,7 @@ "b" ], "numArgs": 2, + "example": "{{ subtract 10 5 }} -> 5", "description": "

Return the product of a minus b.

\n" }, "sum": { @@ -113,7 +126,7 @@ "array" ], "numArgs": 1, - "example": "handlebars {{sum \"[1, 2, 3, 4, 5]\"}} ", + "example": "{{ sum [1, 2, 3] }} -> 6", "description": "

Returns the sum of all numbers in the given array.

\n" }, "times": { @@ -122,6 +135,7 @@ "b" ], "numArgs": 2, + "example": "{{ times 10 5 }} -> 50", "description": "

Multiply number a by number b.

\n" } }, @@ -132,7 +146,7 @@ "n" ], "numArgs": 2, - "example": "handlebars {{after array 1}} ", + "example": "{{ after [1, 2, 3] 1}} -> [3]", "description": "

Returns all of the items in an array after the specified index. Opposite of before.

\n" }, "arrayify": { @@ -140,7 +154,7 @@ "value" ], "numArgs": 1, - "example": "handlebars {{arrayify \"foo\"}} ", + "example": "{{ arrayify \"foo\" }} -> [\"foo\"]", "description": "

Cast the given value to an array.

\n" }, "before": { @@ -149,7 +163,7 @@ "n" ], "numArgs": 2, - "example": "handlebars {{before array 2}} ", + "example": "{{ before [1, 2, 3] 2}} -> [1, 2]", "description": "

Return all of the items in the collection before the specified count. Opposite of after.

\n" }, "eachIndex": { @@ -158,7 +172,7 @@ "options" ], "numArgs": 2, - "example": "handlebars {{#eachIndex array}} {{item}} is {{index}} {{/eachIndex}} ", + "example": "{{#eachIndex [1, 2, 3]}} {{item}} is {{index}} {{/eachIndex}}", "description": "

Iterates the array, listing an item and the index of it.

\n" }, "filter": { @@ -168,7 +182,7 @@ "options" ], "numArgs": 3, - "example": "handlebars {{#filter array \"foo\"}}AAA{{else}}BBB{{/filter}} ", + "example": "{{#filter [1, 2, 3] 2}}2 Found{{else}}2 not found{{/filter}}", "description": "

Block helper that filters the given array and renders the block for values that evaluate to true, otherwise the inverse block is returned.

\n" }, "first": { @@ -177,7 +191,7 @@ "n" ], "numArgs": 2, - "example": "handlebars {{first \"['a', 'b', 'c', 'd', 'e']\" 2}} ", + "example": "{{first [1, 2, 3, 4] 2}} -> [1, 2]", "description": "

Returns the first item, or first n items of an array.

\n" }, "forEach": { @@ -185,7 +199,7 @@ "array" ], "numArgs": 1, - "example": "handlebars {{#forEach accounts}} {{ name }} {{#unless isLast}}, {{/unless}} {{/forEach}} ", + "example": "{{#forEach [{ 'name': 'John' }] }} {{ name }} {{/forEach}}", "description": "

Iterates over each item in an array and exposes the current item in the array as context to the inner block. In addition to the current array item, the helper exposes the following variables to the inner block: - index - total - isFirst - isLast Also, @index is exposed as a private variable, and additional private variables may be defined as hash arguments.

\n" }, "inArray": { @@ -195,7 +209,7 @@ "options" ], "numArgs": 3, - "example": "handlebars {{#inArray array \"d\"}} foo {{else}} bar {{/inArray}} ", + "example": "{{#inArray [1, 2, 3] 2}} 2 exists {{else}} 2 does not exist {{/inArray}} -> 2 exists", "description": "

Block helper that renders the block if an array has the given value. Optionally specify an inverse block to render when the array does not have the given value.

\n" }, "isArray": { @@ -203,7 +217,7 @@ "value" ], "numArgs": 1, - "example": "handlebars {{isArray \"abc\"}} {{isArray array}} ", + "example": "{{isArray [1, 2]}} -> true", "description": "

Returns true if value is an es5 array.

\n" }, "itemAt": { @@ -212,7 +226,7 @@ "idx" ], "numArgs": 2, - "example": "handlebars {{itemAt array 1}} ", + "example": "{{itemAt [1, 2, 3] 1}} -> 2", "description": "

Returns the item from array at index idx.

\n" }, "join": { @@ -221,7 +235,7 @@ "separator" ], "numArgs": 2, - "example": "handlebars {{join array}} {{join array '-'}} ", + "example": "{{join [1, 2, 3]}} -> '1, 2, 3'", "description": "

Join all elements of array into a string, optionally using a given separator.

\n" }, "equalsLength": { @@ -231,6 +245,7 @@ "options" ], "numArgs": 3, + "example": "{{equalsLength [1, 2, 3] 3}} -> true", "description": "

Returns true if the the length of the given value is equal to the given length. Can be used as a block or inline helper.

\n" }, "last": { @@ -239,7 +254,7 @@ "n" ], "numArgs": 2, - "example": "handlebars {{last value}} {{last value 2}} {{last value 3}} ", + "example": "{{last [1, 2, 3]}} -> 3", "description": "

Returns the last item, or last n items of an array or string. Opposite of first.

\n" }, "length": { @@ -247,7 +262,7 @@ "value" ], "numArgs": 1, - "example": "handlebars {{length '[\"a\", \"b\", \"c\"]'}} {{length myArray}} {{length myObject}} ", + "example": "{{length [1, 2, 3]}} -> 3", "description": "

Returns the length of the given string or array.

\n" }, "lengthEqual": { @@ -257,6 +272,7 @@ "options" ], "numArgs": 3, + "example": "{{equalsLength [1, 2, 3] 3}} -> true", "description": "

Returns true if the the length of the given value is equal to the given length. Can be used as a block or inline helper.

\n" }, "map": { @@ -265,7 +281,7 @@ "fn" ], "numArgs": 2, - "example": "handlebars {{map array double}} ", + "example": "{{map [1, 2, 3] double}} -> [2, 4, 6]", "description": "

Returns a new array, created by calling function on each element of the given array. For example,

\n" }, "pluck": { @@ -274,7 +290,7 @@ "prop" ], "numArgs": 2, - "example": "handlebars // {{pluck items \"data.title\"}} ", + "example": "{{pluck [{ 'name': 'Bob' }] \"name\" }} -> ['Bob']", "description": "

Map over the given object or array or objects and create an array of values from the given prop. Dot-notation may be used (as a string) to get nested properties.

\n" }, "reverse": { @@ -282,7 +298,7 @@ "value" ], "numArgs": 1, - "example": "handlebars {{reverse value}} {{reverse value}} ", + "example": "{{reverse [1, 2, 3]}} -> [3, 2, 1]", "description": "

Reverse the elements in an array, or the characters in a string.

\n" }, "some": { @@ -292,7 +308,7 @@ "provided" ], "numArgs": 3, - "example": "handlebars {{#some array isString}} Render me if the array has a string. {{else}} Render me if it doesn't. {{/some}} ", + "example": "{{#some [1, 'b', 3] isString}} string found {{else}} No string found {{/some}} -> string found", "description": "

Block helper that returns the block if the callback returns true for some value in the given array.

\n" }, "sort": { @@ -301,7 +317,7 @@ "key" ], "numArgs": 2, - "example": "handlebars {{sort array}} ", + "example": "{{ sort ['b', 'a', 'c'] }} -> ['a', 'b', 'c']", "description": "

Sort the given array. If an array of objects is passed, you may optionally pass a key to sort on as the second argument. You may alternatively pass a sorting function as the second argument.

\n" }, "sortBy": { @@ -310,7 +326,7 @@ "props" ], "numArgs": 2, - "example": "handlebars {{sortBy array \"a\"}} ", + "example": "{{ sortBy [{a: 'zzz'}, {a: 'aaa'}] \"a\" }} -> [{\"a\":\"aaa\"}, {\"a\":\"zzz\"}]", "description": "

Sort an array. If an array of objects is passed, you may optionally pass a key to sort on as the second argument. You may alternatively pass a sorting function as the second argument.

\n" }, "withAfter": { @@ -320,7 +336,7 @@ "options" ], "numArgs": 3, - "example": "handlebars {{#withAfter array 3}} {{this}} {{/withAfter}} ", + "example": "{{ withAfter [1, 2, 3] 1 }} {{this}} {{/withAfter}}", "description": "

Use the items in the array after the specified index as context inside a block. Opposite of withBefore.

\n" }, "withBefore": { @@ -330,7 +346,7 @@ "options" ], "numArgs": 3, - "example": "handlebars {{#withBefore array 3}} {{this}} {{/withBefore}} ", + "example": "{{ withBefore [1, 2, 3] 2 }} {{this}} {{/withBefore}}", "description": "

Use the items in the array before the specified index as context inside a block. Opposite of withAfter.

\n" }, "withFirst": { @@ -340,7 +356,7 @@ "options" ], "numArgs": 3, - "example": "handlebars {{#withFirst array}} {{this}} {{/withFirst}} ", + "example": "{{ withFirst [1, 2, 3] }} {{this}} {{/withFirst}}", "description": "

Use the first item in a collection inside a handlebars block expression. Opposite of withLast.

\n" }, "withGroup": { @@ -350,7 +366,7 @@ "options" ], "numArgs": 3, - "example": "handlebars {{#withGroup array 4}} {{#each this}} {{.}} {{each}}
{{/withGroup}} ", + "example": "{{#withGroup [1, 2, 3, 4] 2}} {{#each this}} {{.}} {{each}}
{{/withGroup}} -> 1,2
3,4
", "description": "

Block helper that groups array elements by given group size.

\n" }, "withLast": { @@ -360,7 +376,7 @@ "options" ], "numArgs": 3, - "example": "handlebars {{#withLast array}} {{this}} {{/withLast}} ", + "example": "{{#withLast [1, 2, 3, 4]}} {{this}} {{/withLast}} -> 4", "description": "

Use the last item or n items in an array as context inside a block. Opposite of withFirst.

\n" }, "withSort": { @@ -370,7 +386,7 @@ "options" ], "numArgs": 3, - "example": "handlebars {{#withSort array}}{{this}}{{/withSort}} ", + "example": "{{#withSort ['b', 'a', 'c']}} {{this}} {{/withSort}} -> abc", "description": "

Block helper that sorts a collection and exposes the sorted collection as context inside the block.

\n" }, "unique": { @@ -379,7 +395,7 @@ "options" ], "numArgs": 2, - "example": "handlebars {{#each (unique array)}}{{.}}{{/each}} ", + "example": "{{#each (unique ['a', 'a', 'c', 'b', 'e', 'e']) }} {{.}} {{/each}} -> acbe", "description": "

Block helper that return an array with all duplicate values removed. Best used along with a each helper.

\n" } }, @@ -389,6 +405,7 @@ "number" ], "numArgs": 1, + "example": "{{ bytes 1386 }} -> 1.4Kb", "description": "

Format a number to it's equivalent in bytes. If a string is passed, it's length will be formatted and returned. Examples: - 'foo' => 3 B - 13661855 => 13.66 MB - 825399 => 825.39 kB - 1396 => 1.4 kB

\n" }, "addCommas": { @@ -396,6 +413,7 @@ "num" ], "numArgs": 1, + "example": "{{ addCommas 1000000 }} -> 1,000,000", "description": "

Add commas to numbers

\n" }, "phoneNumber": { @@ -403,6 +421,7 @@ "num" ], "numArgs": 1, + "example": "{{ phoneNumber 8005551212 }} -> (800) 555-1212", "description": "

Convert a string or number to a formatted phone number.

\n" }, "toAbbr": { @@ -411,6 +430,7 @@ "precision" ], "numArgs": 2, + "example": "{{ toAbbr 10123 2 }} -> 10.12k", "description": "

Abbreviate numbers to the given number of precision. This for general numbers, not size in bytes.

\n" }, "toExponential": { @@ -419,7 +439,7 @@ "fractionDigits" ], "numArgs": 2, - "example": "handlebars {{toExponential number digits}}; ", + "example": "{{ toExponential 10123 2 }} -> 101e+4", "description": "

Returns a string representing the given number in exponential notation.

\n" }, "toFixed": { @@ -428,7 +448,7 @@ "digits" ], "numArgs": 2, - "example": "handlebars {{toFixed \"1.1234\" 2}} //=> '1.12' ", + "example": "{{ toFixed 1.1234 2 }} -> 1.12", "description": "

Formats the given number using fixed-point notation.

\n" }, "toFloat": { @@ -451,7 +471,7 @@ "precision" ], "numArgs": 2, - "example": "handlebars {{toPrecision \"1.1234\" 2}} //=> '1.1' ", + "example": "{{toPrecision \"1.1234\" 2}}", "description": "

Returns a string representing the Number object to the specified precision.

\n" } }, @@ -461,6 +481,7 @@ "str" ], "numArgs": 1, + "example": "{{ encodeURI \"https://myurl?Hello There\" }} -> https://myurl?Hello%20There", "description": "

Encodes a Uniform Resource Identifier (URI) component by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character.

\n" }, "escape": { @@ -468,6 +489,7 @@ "str" ], "numArgs": 1, + "example": "{{ escape \"https://myurl?Hello+There\" }} -> https://myurl?Hello%20There", "description": "

Escape the given string by replacing characters with escape sequences. Useful for allowing the string to be used in a URL, etc.

\n" }, "decodeURI": { @@ -475,6 +497,7 @@ "str" ], "numArgs": 1, + "example": "{{ escape \"https://myurl?Hello%20There\" }} -> https://myurl?Hello+There", "description": "

Decode a Uniform Resource Identifier (URI) component.

\n" }, "url_encode": { @@ -493,6 +516,7 @@ "href" ], "numArgs": 2, + "example": "{{ urlResolve \"https://myurl\" \"/api/test\" }} -> https://myurl/api/test", "description": "

Take a base URL, and a href URL, and resolve them as a browser would for an anchor tag.

\n" }, "urlParse": { @@ -500,6 +524,7 @@ "str" ], "numArgs": 1, + "example": "{{ urlParse \"https://myurl/api/test\" }}", "description": "

Parses a url string into an object.

\n" }, "stripQuerystring": { @@ -507,6 +532,7 @@ "url" ], "numArgs": 1, + "example": "{{ stripQueryString \"https://myurl/api/test?foo=bar\" }} -> \"https://myurl/api/test\"", "description": "

Strip the query string from the given url.

\n" }, "stripProtocol": { @@ -514,7 +540,7 @@ "str" ], "numArgs": 1, - "example": "handlebars {{stripProtocol url}} ", + "example": "{{ stripProtocol \"https://myurl/api/test\" }} -> \"myurl/api/test\"", "description": "

Strip protocol from a url. Useful for displaying media that may have an 'http' protocol on secure connections.

\n" } }, @@ -525,7 +551,7 @@ "suffix" ], "numArgs": 2, - "example": "handlebars {{append item.stem \".html\"}} ", + "example": "{{append \"index\" \".html\"}} -> index.html", "description": "

Append the specified suffix to the given string.

\n" }, "camelcase": { @@ -533,7 +559,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{camelcase \"foo bar baz\"}}; ", + "example": "{{camelcase \"foo bar baz\"}} -> fooBarBaz", "description": "

camelCase the characters in the given string.

\n" }, "capitalize": { @@ -541,7 +567,7 @@ "str" ], "numArgs": 1, - "example": "handlebars {{capitalize \"foo bar baz\"}} ", + "example": "{{capitalize \"foo bar baz\"}} -> Foo bar baz", "description": "

Capitalize the first word in a sentence.

\n" }, "capitalizeAll": { @@ -549,7 +575,7 @@ "str" ], "numArgs": 1, - "example": "handlebars {{capitalizeAll \"foo bar baz\"}} ", + "example": "{{ capitalizeAll \"foo bar baz\"}} -> Foo Bar Baz", "description": "

Capitalize all words in a string.

\n" }, "center": { @@ -558,6 +584,7 @@ "spaces" ], "numArgs": 2, + "example": "{{ center \"test\" 1}} -> \" test \"", "description": "

Center a string using non-breaking spaces

\n" }, "chop": { @@ -565,7 +592,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{chop \"_ABC_\"}} {{chop \"-ABC-\"}} {{chop \" ABC \"}} ", + "example": "{{ chop \" ABC \"}} -> \"ABC\"", "description": "

Like trim, but removes both extraneous whitespace and non-word characters from the beginning and end of a string.

\n" }, "dashcase": { @@ -573,7 +600,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{dashcase \"a-b-c d_e\"}} ", + "example": "{{dashcase \"a-b-c d_e\"}} -> a-b-c-d-e", "description": "

dash-case the characters in string. Replaces non-word characters and periods with hyphens.

\n" }, "dotcase": { @@ -581,7 +608,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{dotcase \"a-b-c d_e\"}} ", + "example": "{{dotcase \"a-b-c d_e\"}} -> a.b.c.d.e", "description": "

dot.case the characters in string.

\n" }, "downcase": { @@ -589,7 +616,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{downcase \"aBcDeF\"}} ", + "example": "{{downcase \"aBcDeF\"}} -> abcdef", "description": "

Lowercase all of the characters in the given string. Alias for lowercase.

\n" }, "ellipsis": { @@ -598,7 +625,7 @@ "length" ], "numArgs": 2, - "example": "handlebars {{ellipsis (sanitize \"foo bar baz\"), 7}} {{ellipsis \"foo bar baz\", 7}} ", + "example": "{{ellipsis \"foo bar baz\", 7}} -> foo bar…", "description": "

Truncates a string to the specified length, and appends it with an elipsis, ….

\n" }, "hyphenate": { @@ -606,7 +633,7 @@ "str" ], "numArgs": 1, - "example": "handlebars {{hyphenate \"foo bar baz qux\"}} ", + "example": "{{hyphenate \"foo bar baz qux\"}} -> foo-bar-baz-qux", "description": "

Replace spaces in a string with hyphens.

\n" }, "isString": { @@ -614,7 +641,7 @@ "value" ], "numArgs": 1, - "example": "handlebars {{isString \"foo\"}} ", + "example": "{{isString \"foo\"}} -> true", "description": "

Return true if value is a string.

\n" }, "lowercase": { @@ -622,7 +649,7 @@ "str" ], "numArgs": 1, - "example": "handlebars {{lowercase \"Foo BAR baZ\"}} ", + "example": "{{lowercase \"Foo BAR baZ\"}} -> foo bar baz", "description": "

Lowercase all characters in the given string.

\n" }, "occurrences": { @@ -631,7 +658,7 @@ "substring" ], "numArgs": 2, - "example": "handlebars {{occurrences \"foo bar foo bar baz\" \"foo\"}} ", + "example": "{{occurrences \"foo bar foo bar baz\" \"foo\"}} -> 2", "description": "

Return the number of occurrences of substring within the given string.

\n" }, "pascalcase": { @@ -639,7 +666,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{pascalcase \"foo bar baz\"}} ", + "example": "{{pascalcase \"foo bar baz\"}} -> FooBarBaz", "description": "

PascalCase the characters in string.

\n" }, "pathcase": { @@ -647,7 +674,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{pathcase \"a-b-c d_e\"}} ", + "example": "{{pathcase \"a-b-c d_e\"}} -> a/b/c/d/e", "description": "

path/case the characters in string.

\n" }, "plusify": { @@ -655,7 +682,7 @@ "str" ], "numArgs": 1, - "example": "handlebars {{plusify \"foo bar baz\"}} ", + "example": "{{plusify \"foo bar baz\"}} -> foo+bar+baz", "description": "

Replace spaces in the given string with pluses.

\n" }, "prepend": { @@ -664,7 +691,7 @@ "prefix" ], "numArgs": 2, - "example": "handlebars {{prepend val \"foo-\"}} ", + "example": "{{prepend \"bar\" \"foo-\"}} -> foo-bar", "description": "

Prepends the given string with the specified prefix.

\n" }, "raw": { @@ -672,7 +699,7 @@ "options" ], "numArgs": 1, - "example": "handlebars {{{{#raw}}}} {{foo}} {{{{/raw}}}} ", + "example": "{{{{#raw}}}} {{foo}} {{{{/raw}}}} -> {{foo}}", "description": "

Render a block without processing mustache templates inside the block.

\n" }, "remove": { @@ -681,7 +708,7 @@ "substring" ], "numArgs": 2, - "example": "handlebars {{remove \"a b a b a b\" \"a \"}} ", + "example": "{{remove \"a b a b a b\" \"a \"}} -> b b b", "description": "

Remove all occurrences of substring from the given str.

\n" }, "removeFirst": { @@ -690,7 +717,7 @@ "substring" ], "numArgs": 2, - "example": "handlebars {{remove \"a b a b a b\" \"a\"}} ", + "example": "{{remove \"a b a b a b\" \"a\"}} -> b a b a b", "description": "

Remove the first occurrence of substring from the given str.

\n" }, "replace": { @@ -700,7 +727,7 @@ "b" ], "numArgs": 3, - "example": "handlebars {{replace \"a b a b a b\" \"a\" \"z\"}} ", + "example": "{{replace \"a b a b a b\" \"a\" \"z\"}} -> z b z b z b", "description": "

Replace all occurrences of substring a with substring b.

\n" }, "replaceFirst": { @@ -710,7 +737,7 @@ "b" ], "numArgs": 3, - "example": "handlebars {{replace \"a b a b a b\" \"a\" \"z\"}} ", + "example": "{{replace \"a b a b a b\" \"a\" \"z\"}} -> z b a b a b", "description": "

Replace the first occurrence of substring a with substring b.

\n" }, "sentence": { @@ -718,7 +745,7 @@ "str" ], "numArgs": 1, - "example": "handlebars {{sentence \"hello world. goodbye world.\"}} ", + "example": "{{sentence \"hello world. goodbye world.\"}} -> Hello world. Goodbye world.", "description": "

Sentence case the given string

\n" }, "snakecase": { @@ -726,7 +753,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{snakecase \"a-b-c d_e\"}} ", + "example": "{{snakecase \"a-b-c d_e\"}} -> a_b_c_d_e", "description": "

snake_case the characters in the given string.

\n" }, "split": { @@ -734,7 +761,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{split \"a,b,c\" \",\"}} ", + "example": "{{split \"a,b,c\"}} -> ['a', 'b', 'c']", "description": "

Split string by the given character.

\n" }, "startsWith": { @@ -744,7 +771,7 @@ "options" ], "numArgs": 3, - "example": "handlebars {{#startsWith \"Goodbye\" \"Hello, world!\"}} Whoops {{else}} Bro, do you even hello world? {{/startsWith}} ", + "example": "{{#startsWith \"Goodbye\" \"Hello, world!\"}} Yep {{else}} Nope {{/startsWith}} -> Nope", "description": "

Tests whether a string begins with the given prefix.

\n" }, "titleize": { @@ -752,7 +779,7 @@ "str" ], "numArgs": 1, - "example": "handlebars {{titleize \"this title case\"}} ", + "example": "{{#titleize \"this is title case\" }} -> This Is Title Case", "description": "

Title case the given string.

\n" }, "trim": { @@ -760,7 +787,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{trim \" ABC \"}} ", + "example": "{{trim \" ABC \" }} -> ABC", "description": "

Removes extraneous whitespace from the beginning and end of a string.

\n" }, "trimLeft": { @@ -768,7 +795,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{trim \" ABC \"}} ", + "example": "{{trimLeft \" ABC \" }} -> \"ABC \"", "description": "

Removes extraneous whitespace from the beginning of a string.

\n" }, "trimRight": { @@ -776,7 +803,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{trimRight \" ABC \"}} ", + "example": "{{trimRight \" ABC \" }} -> \" ABC \"", "description": "

Removes extraneous whitespace from the end of a string.

\n" }, "truncate": { @@ -786,7 +813,7 @@ "suffix" ], "numArgs": 3, - "example": "handlebars truncate(\"foo bar baz\", 7); truncate(sanitize(\"foo bar baz\", 7)); ", + "example": "{{truncate \"foo bar baz\" 7 }} -> foo bar", "description": "

Truncate a string to the specified length. Also see ellipsis.

\n" }, "truncateWords": { @@ -796,7 +823,7 @@ "suffix" ], "numArgs": 3, - "example": "handlebars truncateWords(\"foo bar baz\", 1); truncateWords(\"foo bar baz\", 2); truncateWords(\"foo bar baz\", 3); ", + "example": "{{truncateWords \"foo bar baz\" 1 }} -> foo", "description": "

Truncate a string to have the specified number of words. Also see truncate.

\n" }, "upcase": { @@ -804,7 +831,7 @@ "string" ], "numArgs": 1, - "example": "handlebars {{upcase \"aBcDeF\"}} ", + "example": "{{upcase \"aBcDef\"}} -> ABCDEF", "description": "

Uppercase all of the characters in the given string. Alias for uppercase.

\n" }, "uppercase": { @@ -813,7 +840,7 @@ "options" ], "numArgs": 2, - "example": "handlebars {{uppercase \"aBcDeF\"}} ", + "example": "{{uppercase \"aBcDef\"}} -> ABCDEF", "description": "

Uppercase all of the characters in the given string. If used as a block helper it will uppercase the entire block. This helper does not support inverse blocks.

\n" } }, @@ -825,7 +852,7 @@ "options" ], "numArgs": 3, - "example": "handlebars {{#and great magnificent}}A{{else}}B{{/and}} ", + "example": "{{#and great magnificent}}both{{else}}no{{/and}}", "description": "

Helper that renders the block if both of the given values are truthy. If an inverse block is specified it will be rendered when falsy. Works as a block helper, inline helper or subexpression.

\n" }, "compare": { @@ -836,6 +863,7 @@ "options" ], "numArgs": 4, + "example": "{{compare 10 \"<\" 5 }} -> true", "description": "

Render a block when a comparison of the first and third arguments returns true. The second argument is the [arithemetic operator][operators] to use. You may also optionally specify an inverse block to render when falsy.

\n" }, "contains": { @@ -846,7 +874,7 @@ "options" ], "numArgs": 4, - "example": "handlebars {{#contains array \"d\"}} This will not be rendered. {{else}} This will be rendered. {{/contains}} ", + "example": "{{#contains ['a', 'b', 'c'] \"d\"}} This will not be rendered. {{else}} This will be rendered. {{/contains}}", "description": "

Block helper that renders the block if collection has the given value, using strict equality (===) for comparison, otherwise the inverse block is rendered (if specified). If a startIndex is specified and is negative, it is used as the offset from the end of the collection.

\n" }, "default": { @@ -855,6 +883,7 @@ "defaultValue" ], "numArgs": 2, + "example": "{{default null null \"default\"}} -> default", "description": "

Returns the first value that is not undefined, otherwise the "default" value is returned.

\n" }, "eq": { @@ -864,6 +893,7 @@ "options" ], "numArgs": 3, + "example": "{{#eq 3 3}} equal{{else}} not equal{{/eq}} -> equal", "description": "

Block helper that renders a block if a is equal to b. If an inverse block is specified it will be rendered when falsy. You may optionally use the compare="" hash argument for the second value.

\n" }, "gt": { @@ -873,6 +903,7 @@ "options" ], "numArgs": 3, + "example": "{{#gt 4 3}} greater than{{else}} not greater than{{/gt}} -> greater than", "description": "

Block helper that renders a block if a is greater than b. If an inverse block is specified it will be rendered when falsy. You may optionally use the compare="" hash argument for the second value.

\n" }, "gte": { @@ -882,6 +913,7 @@ "options" ], "numArgs": 3, + "example": "{{#gte 4 3}} greater than or equal{{else}} not greater than{{/gte}} -> greater than or equal", "description": "

Block helper that renders a block if a is greater than or equal to b. If an inverse block is specified it will be rendered when falsy. You may optionally use the compare="" hash argument for the second value.

\n" }, "has": { @@ -891,6 +923,7 @@ "options" ], "numArgs": 3, + "example": "{{#has \"foobar\" \"foo\"}} has it{{else}} doesn't{{/has}} -> has it", "description": "

Block helper that renders a block if value has pattern. If an inverse block is specified it will be rendered when falsy.

\n" }, "isFalsey": { @@ -899,6 +932,7 @@ "options" ], "numArgs": 2, + "example": "{{isFalsey \"\" }} -> true", "description": "

Returns true if the given value is falsey. Uses the [falsey][] library for comparisons. Please see that library for more information or to report bugs with this helper.

\n" }, "isTruthy": { @@ -907,6 +941,7 @@ "options" ], "numArgs": 2, + "example": "{{isTruthy \"12\" }} -> true", "description": "

Returns true if the given value is truthy. Uses the [falsey][] library for comparisons. Please see that library for more information or to report bugs with this helper.

\n" }, "ifEven": { @@ -915,7 +950,7 @@ "options" ], "numArgs": 2, - "example": "handlebars {{#ifEven value}} render A {{else}} render B {{/ifEven}} ", + "example": "{{#ifEven 2}} even {{else}} odd {{/ifEven}} -> even", "description": "

Return true if the given value is an even number.

\n" }, "ifNth": { @@ -925,6 +960,7 @@ "options" ], "numArgs": 3, + "example": "{{#ifNth 10 2}} remainder {{else}} no remainder {{/ifNth}} -> remainder", "description": "

Conditionally renders a block if the remainder is zero when a operand is divided by b. If an inverse block is specified it will be rendered when the remainder is not zero.

\n" }, "ifOdd": { @@ -933,7 +969,7 @@ "options" ], "numArgs": 2, - "example": "handlebars {{#ifOdd value}} render A {{else}} render B {{/ifOdd}} ", + "example": "{{#ifOdd 3}} odd {{else}} even {{/ifOdd}} -> odd", "description": "

Block helper that renders a block if value is an odd number. If an inverse block is specified it will be rendered when falsy.

\n" }, "is": { @@ -943,6 +979,7 @@ "options" ], "numArgs": 3, + "example": "{{#is 3 3}} is {{else}} is not {{/is}} -> is", "description": "

Block helper that renders a block if a is equal to b. If an inverse block is specified it will be rendered when falsy. Similar to eq but does not do strict equality.

\n" }, "isnt": { @@ -952,6 +989,7 @@ "options" ], "numArgs": 3, + "example": "{{#isnt 3 3}} isnt {{else}} is {{/isnt}} -> is", "description": "

Block helper that renders a block if a is not equal to b. If an inverse block is specified it will be rendered when falsy. Similar to unlessEq but does not use strict equality for comparisons.

\n" }, "lt": { @@ -960,6 +998,7 @@ "options" ], "numArgs": 2, + "example": "{{#lt 2 3}} less than {{else}} more than or equal {{/lt}} -> less than", "description": "

Block helper that renders a block if a is less than b. If an inverse block is specified it will be rendered when falsy. You may optionally use the compare="" hash argument for the second value.

\n" }, "lte": { @@ -969,6 +1008,7 @@ "options" ], "numArgs": 3, + "example": "{{#lte 2 3}} less than or equal {{else}} more than {{/lte}} -> less than or equal", "description": "

Block helper that renders a block if a is less than or equal to b. If an inverse block is specified it will be rendered when falsy. You may optionally use the compare="" hash argument for the second value.

\n" }, "neither": { @@ -978,6 +1018,7 @@ "options" ], "numArgs": 3, + "example": "{{#neither null null}} both falsey {{else}} both not falsey {{/neither}} -> both falsey", "description": "

Block helper that renders a block if neither of the given values are truthy. If an inverse block is specified it will be rendered when falsy.

\n" }, "not": { @@ -986,6 +1027,7 @@ "options" ], "numArgs": 2, + "example": "{{#not undefined }} falsey {{else}} not falsey {{/not}} -> falsey", "description": "

Returns true if val is falsey. Works as a block or inline helper.

\n" }, "or": { @@ -994,7 +1036,7 @@ "options" ], "numArgs": 2, - "example": "handlebars {{#or a b c}} If any value is true this will be rendered. {{/or}} ", + "example": "{{#or 1 2 undefined }} at least one truthy {{else}} all falsey {{/or}} -> at least one truthy", "description": "

Block helper that renders a block if any of the given values is truthy. If an inverse block is specified it will be rendered when falsy.

\n" }, "unlessEq": { @@ -1004,6 +1046,7 @@ "options" ], "numArgs": 3, + "example": "{{#unlessEq 2 1 }} not equal {{else}} equal {{/unlessEq}} -> not equal", "description": "

Block helper that always renders the inverse block unless a is equal to b.

\n" }, "unlessGt": { @@ -1013,6 +1056,7 @@ "options" ], "numArgs": 3, + "example": "{{#unlessGt 20 1 }} not greater than {{else}} greater than {{/unlessGt}} -> greater than", "description": "

Block helper that always renders the inverse block unless a is greater than b.

\n" }, "unlessLt": { @@ -1022,6 +1066,7 @@ "options" ], "numArgs": 3, + "example": "{{#unlessLt 20 1 }} greater than or equal {{else}} less than {{/unlessLt}} -> greater than or equal", "description": "

Block helper that always renders the inverse block unless a is less than b.

\n" }, "unlessGteq": { @@ -1031,6 +1076,7 @@ "options" ], "numArgs": 3, + "example": "{{#unlessGteq 20 1 }} less than {{else}} greater than or equal to {{/unlessGteq}} -> greater than or equal to", "description": "

Block helper that always renders the inverse block unless a is greater than or equal to b.

\n" }, "unlessLteq": { @@ -1040,6 +1086,7 @@ "options" ], "numArgs": 3, + "example": "{{#unlessLteq 20 1 }} greater than {{else}} less than or equal to {{/unlessLteq}} -> greater than", "description": "

Block helper that always renders the inverse block unless a is less than or equal to b.

\n" } }, @@ -1050,8 +1097,17 @@ "format" ], "numArgs": 2, - "example": "{{date now \"YYYY\"}}", - "description": "

Format a date using moment.js data formatting.

\n" + "example": "{{date now \"DD-MM-YYYY\"}} -> 21-01-2021", + "description": "

Format a date using moment.js date formatting.

\n" + }, + "duration": { + "args": [ + "time", + "durationType" + ], + "numArgs": 2, + "example": "{{duration timeLeft \"seconds\"}} -> a few seconds", + "description": "

Produce a humanized duration left/until given an amount of time and the type of time measurement.

\n" } } } \ No newline at end of file diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 1ebaab1d08..f6a7a12f77 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.6.2", + "version": "0.7.4", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.js", "module": "src/index.js", @@ -14,10 +14,10 @@ "manifest": "node ./scripts/gen-collection-info.js" }, "dependencies": { - "@budibase/handlebars-helpers": "^0.11.1", + "@budibase/handlebars-helpers": "^0.11.3", + "dayjs": "^1.10.4", "handlebars": "^4.7.6", "handlebars-utils": "^1.0.6", - "helper-date": "^1.0.1", "lodash": "^4.17.20" }, "devDependencies": { @@ -32,5 +32,6 @@ "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-terser": "^7.0.2", "typescript": "^4.1.3" - } + }, + "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd" } diff --git a/packages/string-templates/scripts/gen-collection-info.js b/packages/string-templates/scripts/gen-collection-info.js index d7e464a8ae..a33d967a62 100644 --- a/packages/string-templates/scripts/gen-collection-info.js +++ b/packages/string-templates/scripts/gen-collection-info.js @@ -5,18 +5,32 @@ const fs = require("fs") const doctrine = require("doctrine") const marked = require("marked") -const DIRECTORY = fs.existsSync("node_modules") ? "." : ".." - -const FILENAME = `${DIRECTORY}/manifest.json` - /** * full list of supported helpers can be found here: - * https://github.com/helpers/handlebars-helpers + * https://github.com/budibase/handlebars-helpers */ +const DIRECTORY = fs.existsSync("node_modules") ? "." : ".." const COLLECTIONS = ["math", "array", "number", "url", "string", "comparison"] - +const FILENAME = `${DIRECTORY}/manifest.json` const outputJSON = {} +const ADDED_HELPERS = { + date: { + date: { + args: ["datetime", "format"], + numArgs: 2, + example: '{{date now "DD-MM-YYYY"}} -> 21-01-2021', + description: "Format a date using moment.js date formatting.", + }, + duration: { + args: ["time", "durationType"], + numArgs: 2, + example: '{{duration timeLeft "seconds"}} -> a few seconds', + description: + "Produce a humanized duration left/until given an amount of time and the type of time measurement.", + }, + }, +} function fixSpecialCases(name, obj) { const args = obj.args @@ -78,11 +92,14 @@ function getCommentInfo(file, func) { docs.description = docs.description.replace(/\n/g, " ") docs.description = docs.description.replace(/[ ]{2,}/g, " ") docs.description = docs.description.replace(/is is/g, "is") - const example = docs.description.split("```") - if (example.length > 1) { - docs.example = example[1] + const examples = docs.tags + .filter(el => el.title === "example") + .map(el => el.description) + const blocks = docs.description.split("```") + if (examples.length > 0) { + docs.example = examples.join(" ") } - docs.description = example[0].trim() + docs.description = blocks[0].trim() return docs } @@ -131,15 +148,15 @@ function run() { } outputJSON[collection] = collectionInfo } - // add the date helper - outputJSON["date"] = { - date: { - args: ["datetime", "format"], - numArgs: 2, - example: '{{date now "YYYY"}}', - description: "Format a date using moment.js data formatting.", - }, + // add extra helpers + for (let [collectionName, collection] of Object.entries(ADDED_HELPERS)) { + let input = collection + if (outputJSON[collectionName]) { + input = Object.assign(outputJSON[collectionName], collection) + } + outputJSON[collectionName] = input } + // convert all markdown to HTML for (let collection of Object.values(outputJSON)) { for (let helper of Object.values(collection)) { diff --git a/packages/string-templates/src/helpers/date.js b/packages/string-templates/src/helpers/date.js new file mode 100644 index 0000000000..0d9bd78036 --- /dev/null +++ b/packages/string-templates/src/helpers/date.js @@ -0,0 +1,105 @@ +const dayjs = require("dayjs") +dayjs.extend(require("dayjs/plugin/duration")) +dayjs.extend(require("dayjs/plugin/advancedFormat")) +dayjs.extend(require("dayjs/plugin/relativeTime")) + +/** + * This file was largely taken from the helper-date package - we did this for two reasons: + * 1. It made use of both moment of date.js - this caused some weird bugs with some relatively simple + * syntax and didn't offer much in return. + * 2. Replacing moment with dayjs helps massively reduce bundle size. + * The original package can be found here: + * https://github.com/helpers/helper-date + */ + +function isOptions(val) { + return typeof val === "object" && typeof val.hash === "object" +} + +function isApp(thisArg) { + return ( + typeof thisArg === "object" && + typeof thisArg.options === "object" && + typeof thisArg.app === "object" + ) +} + +function getContext(thisArg, locals, options) { + if (isOptions(thisArg)) { + return getContext({}, locals, thisArg) + } + // ensure args are in the correct order + if (isOptions(locals)) { + return getContext(thisArg, options, locals) + } + const appContext = isApp(thisArg) ? thisArg.context : {} + options = options || {} + + // if "options" is not handlebars options, merge it onto locals + if (!isOptions(options)) { + locals = Object.assign({}, locals, options) + } + // merge handlebars root data onto locals if specified on the hash + if (isOptions(options) && options.hash.root === true) { + locals = Object.assign({}, options.data.root, locals) + } + let context = Object.assign({}, appContext, locals, options.hash) + if (!isApp(thisArg)) { + context = Object.assign({}, thisArg, context) + } + if (isApp(thisArg) && thisArg.view && thisArg.view.data) { + context = Object.assign({}, context, thisArg.view.data) + } + return context +} + +function initialConfig(str, pattern, options) { + if (isOptions(pattern)) { + options = pattern + pattern = null + } + + if (isOptions(str)) { + options = str + pattern = null + str = null + } + return { str, pattern, options } +} + +function setLocale(str, pattern, options) { + // if options is null then it'll get updated here + const config = initialConfig(str, pattern, options) + const defaults = { lang: "en", date: new Date(config.str) } + const opts = getContext(this, defaults, config.options) + + // set the language to use + dayjs.locale(opts.lang || opts.language) +} + +module.exports.date = (str, pattern, options) => { + const config = initialConfig(str, pattern, options) + + // if no args are passed, return a formatted date + if (config.str == null && config.pattern == null) { + dayjs.locale("en") + return dayjs().format("MMMM DD, YYYY") + } + + setLocale(config.str, config.pattern, config.options) + + return dayjs(new Date(config.str)).format(config.pattern) +} + +module.exports.duration = (str, pattern, format) => { + const config = initialConfig(str, pattern) + + setLocale(config.str, config.pattern) + + const duration = dayjs.duration(config.str, config.pattern) + if (!isOptions(format)) { + return duration.format(format) + } else { + return duration.humanize() + } +} diff --git a/packages/string-templates/src/helpers/external.js b/packages/string-templates/src/helpers/external.js index 6cdf976be5..0fa7f734d0 100644 --- a/packages/string-templates/src/helpers/external.js +++ b/packages/string-templates/src/helpers/external.js @@ -1,5 +1,5 @@ const helpers = require("@budibase/handlebars-helpers") -const dateHelper = require("helper-date") +const { date, duration } = require("./date") const { HelperFunctionBuiltin } = require("./constants") /** @@ -14,12 +14,19 @@ const EXTERNAL_FUNCTION_COLLECTIONS = [ "url", "string", "comparison", + "object", + "regex", ] -const DATE_NAME = "date" +const ADDED_HELPERS = { + date: date, + duration: duration, +} exports.registerAll = handlebars => { - handlebars.registerHelper(DATE_NAME, dateHelper) + for (let [name, helper] of Object.entries(ADDED_HELPERS)) { + handlebars.registerHelper(name, helper) + } let externalNames = [] for (let collection of EXTERNAL_FUNCTION_COLLECTIONS) { // collect information about helper @@ -41,12 +48,13 @@ exports.registerAll = handlebars => { }) } // add date external functionality - externalNames.push(DATE_NAME) - exports.externalHelperNames = externalNames + exports.externalHelperNames = externalNames.concat(Object.keys(ADDED_HELPERS)) } exports.unregisterAll = handlebars => { - handlebars.unregisterHelper(DATE_NAME) + for (let name of Object.keys(ADDED_HELPERS)) { + handlebars.unregisterHelper(name) + } for (let name of module.exports.externalHelperNames) { handlebars.unregisterHelper(name) } diff --git a/packages/string-templates/src/index.js b/packages/string-templates/src/index.js index 68652684a8..e662f253c6 100644 --- a/packages/string-templates/src/index.js +++ b/packages/string-templates/src/index.js @@ -2,7 +2,11 @@ const handlebars = require("handlebars") const { registerAll } = require("./helpers/index") const processors = require("./processors") const { cloneDeep } = require("lodash/fp") -const { removeNull, addConstants } = require("./utilities") +const { + removeNull, + addConstants, + removeHandlebarsStatements, +} = require("./utilities") const manifest = require("../manifest.json") const hbsInstance = handlebars.create() @@ -83,16 +87,27 @@ module.exports.processObjectSync = (object, context) => { * @returns {string} The enriched string, all templates should have been replaced if they can be. */ module.exports.processStringSync = (string, context) => { + if (!exports.isValid(string)) { + return string + } + // take a copy of input incase error + const input = string let clonedContext = removeNull(cloneDeep(context)) clonedContext = addConstants(clonedContext) // remove any null/undefined properties if (typeof string !== "string") { throw "Cannot process non-string types." } - string = processors.preprocess(string) - // this does not throw an error when template can't be fulfilled, have to try correct beforehand - const template = hbsInstance.compile(string) - return processors.postprocess(template(clonedContext)) + try { + string = processors.preprocess(string) + // this does not throw an error when template can't be fulfilled, have to try correct beforehand + const template = hbsInstance.compile(string, { + strict: false, + }) + return processors.postprocess(template(clonedContext)) + } catch (err) { + return removeHandlebarsStatements(input) + } } /** @@ -110,17 +125,33 @@ module.exports.makePropSafe = property => { * @returns {boolean} Whether or not the input string is valid. */ module.exports.isValid = string => { - const specialCases = ["isNumber", "expected a number"] + const validCases = [ + "string", + "number", + "object", + "array", + "cannot read property", + ] + // this is a portion of a specific string always output by handlebars in the case of a syntax error + const invalidCases = [`expecting '`] // don't really need a real context to check if its valid const context = {} try { hbsInstance.compile(processors.preprocess(string, false))(context) return true } catch (err) { - const msg = err ? err.message : "" - const foundCase = specialCases.find(spCase => msg.includes(spCase)) + const msg = err && err.message ? err.message : err + if (!msg) { + return false + } + const invalidCase = invalidCases.some(invalidCase => + msg.toLowerCase().includes(invalidCase) + ) + const validCase = validCases.some(validCase => + msg.toLowerCase().includes(validCase) + ) // special case for maths functions - don't have inputs yet - return !!foundCase + return validCase && !invalidCase } } diff --git a/packages/string-templates/src/processors/preprocessor.js b/packages/string-templates/src/processors/preprocessor.js index af6d656eaa..ee3a3a9730 100644 --- a/packages/string-templates/src/processors/preprocessor.js +++ b/packages/string-templates/src/processors/preprocessor.js @@ -63,7 +63,7 @@ module.exports.processors = [ return statement } } - if (HelperNames().some(option => possibleHelper.includes(option))) { + if (HelperNames().some(option => option.includes(possibleHelper))) { insideStatement = `(${insideStatement})` } return `{{ all ${insideStatement} }}` diff --git a/packages/string-templates/src/utilities.js b/packages/string-templates/src/utilities.js index da3aa6ee94..b33e8bfe1d 100644 --- a/packages/string-templates/src/utilities.js +++ b/packages/string-templates/src/utilities.js @@ -32,3 +32,16 @@ module.exports.addConstants = obj => { } return obj } + +module.exports.removeHandlebarsStatements = string => { + let regexp = new RegExp(exports.FIND_HBS_REGEX) + let matches = string.match(regexp) + if (matches == null) { + return string + } + for (let match of matches) { + const idx = string.indexOf(match) + string = exports.swapStrings(string, idx, match.length, "Invalid Binding") + } + return string +} diff --git a/packages/string-templates/test/escapes.spec.js b/packages/string-templates/test/escapes.spec.js index de03c08fe6..21b1c4bcb0 100644 --- a/packages/string-templates/test/escapes.spec.js +++ b/packages/string-templates/test/escapes.spec.js @@ -4,15 +4,15 @@ const { describe("Handling context properties with spaces in their name", () => { it("should allow through literal specifiers", async () => { - const output = await processString("test {{ [test thing] }}", { - "test thing": 1 + const output = await processString("test {{ [one thing] }}", { + "one thing": 1 }) expect(output).toBe("test 1") }) it("should convert to dot notation where required", async () => { - const output = await processString("test {{ test[0] }}", { - test: [2] + const output = await processString("test {{ one[0] }}", { + one: [2] }) expect(output).toBe("test 2") }) @@ -25,9 +25,9 @@ describe("Handling context properties with spaces in their name", () => { }) it("should be able to handle an object with layers that requires escaping", async () => { - const output = await processString("testcase {{ testing.[test case] }}", { - testing: { - "test case": 1 + const output = await processString("testcase {{ thing.[one case] }}", { + thing: { + "one case": 1 } }) expect(output).toBe("testcase 1") @@ -52,10 +52,10 @@ describe("attempt some complex problems", () => { it("should be able to process an odd string produced by builder", async () => { const context = { "c306d140d7e854f388bae056db380a0eb": { - "test prop": "test", + "one prop": "test", } } - const hbs = "null{{ [c306d140d7e854f388bae056db380a0eb].[test prop] }}" + const hbs = "null{{ [c306d140d7e854f388bae056db380a0eb].[one prop] }}" const output = await processString(hbs, context) expect(output).toBe("nulltest") }) diff --git a/packages/string-templates/test/helpers.spec.js b/packages/string-templates/test/helpers.spec.js index 6eadaabb05..89776583c9 100644 --- a/packages/string-templates/test/helpers.spec.js +++ b/packages/string-templates/test/helpers.spec.js @@ -1,5 +1,6 @@ const { processString, + processObject, isValid, } = require("../src/index") @@ -291,14 +292,61 @@ describe("Cover a few complex use cases", () => { expect(output).toBe("e") }) + it("should allow a complex forIn case", async () => { + const input = `{{#forIn (JSONparse '{"a":1, "b":2, "c":3}' )}}number: {{.}}\n{{/forIn}}` + const output = await processString(input, {}) + expect(output).toBe("number: 1\nnumber: 2\nnumber: 3\n") + }) + it("should make sure case is valid", () => { const validity = isValid("{{ avg [c355ec2b422e54f988ae553c8acd811ea].[a] [c355ec2b422e54f988ae553c8acd811ea].[b] }}") expect(validity).toBe(true) }) + it("should make sure object functions check out valid", () => { + const validity = isValid("{{ JSONstringify obj }}") + expect(validity).toBe(true) + }) + it("should be able to solve an example from docs", async () => { const output = await processString(`{{first ( split "a-b-c" "-") 2}}`, {}) expect(output).toBe(`a,b`) + }) + it("should confirm a subtraction validity", () => { + const validity = isValid("{{ subtract [c390c23a7f1b6441c98d2fe2a51248ef3].[total profit] [c390c23a7f1b6441c98d2fe2a51248ef3].[total revenue] }}") + expect(validity).toBe(true) + }) + + it("test a very complex duration output", async () => { + const currentTime = new Date(1612432082000).toISOString(), + eventTime = new Date(1612432071000).toISOString() + const input = `{{duration ( subtract (date currentTime "X")(date eventTime "X")) "seconds"}}` + const output = await processString(input, { + currentTime, + eventTime, + }) + expect(output).toBe("a few seconds") + }) + + it("should confirm a bunch of invalid strings", () => { + const invalids = ["{{ awd )", "{{ awdd () ", "{{ awdwad ", "{{ awddawd }"] + for (let invalid of invalids) { + const validity = isValid(invalid) + expect(validity).toBe(false) + } + }) + + it("input a garbage string, expect it to be returned", async () => { + const input = `{{{{{{ } {{ ]] ] ] }}} {{ ] {{ { } { dsa { dddddd }}}}}}} }DDD` + const output = await processString(input, {}) + expect(output).toBe(input) + }) + + it("getting a nice date from the user", async () => { + const input = {text: `{{ date user.subscriptionDue "DD-MM" }}`} + const context = JSON.parse(`{"user":{"email":"test@test.com","roleId":"ADMIN","type":"user","tableId":"ta_users","subscriptionDue":"2021-01-12T12:00:00.000Z","_id":"ro_ta_users_us_test@test.com","_rev":"2-24cc794985eb54183ecb93e148563f3d"}}`) + const output = await processObject(input, context) + expect(output.text).toBe("12-01") }) }) \ No newline at end of file diff --git a/packages/string-templates/yarn.lock b/packages/string-templates/yarn.lock index 96ff364e51..cb96e4e81c 100644 --- a/packages/string-templates/yarn.lock +++ b/packages/string-templates/yarn.lock @@ -270,10 +270,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/handlebars-helpers@^0.11.1": - version "0.11.1" - resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.1.tgz#fe8672612fb4ad8fd3bad338ee15759f45e421eb" - integrity sha512-s72LhOhlHk43QYGVcqjogaGa4h4e6y6X1AfshqWBWceTRYBs/9tUnoYDUiRJ/Mt3WoTmx8Hj5GOZekSqrUsOFQ== +"@budibase/handlebars-helpers@^0.11.3": + version "0.11.3" + resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.3.tgz#b6e5c91b83e8906e7d7ff10ddde277a3d561016e" + integrity sha512-MS1ptZEYq8o9J3tNLM7cZ2RGSSJIer4GiMIUHtbBI3sC9UKqZebao1JYNfmZKpNjntuqhZKgjqc5GfnVIEjsYQ== dependencies: arr-flatten "^1.1.0" array-sort "^0.1.4" @@ -1596,6 +1596,11 @@ date.js@^0.3.1: dependencies: debug "~3.1.0" +dayjs@^1.10.4: + version "1.10.4" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.4.tgz#8e544a9b8683f61783f570980a8a80eaf54ab1e2" + integrity sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw== + debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -4386,9 +4391,9 @@ source-map-support@^0.5.6, source-map-support@~0.5.19: source-map "^0.6.0" source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== source-map@^0.5.0, source-map@^0.5.6: version "0.5.7" diff --git a/packages/worker/package.json b/packages/worker/package.json index 63d026e56b..24e357bf7d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/deployment", "email": "hi@budibase.com", - "version": "0.6.2", + "version": "0.7.4", "description": "Budibase Deployment Server", "main": "src/index.js", "repository": { @@ -34,5 +34,5 @@ "pouchdb-all-dbs": "^1.0.2", "server-destroy": "^1.0.1" }, - "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491" + "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd" }