From 17314f9a38aee77660d6d57faf508b05b00458ef Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 14 Oct 2021 13:41:23 +0000 Subject: [PATCH 01/15] v0.9.167 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index 798c1a4222..7676925b53 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.166", + "version": "0.9.167", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index 0d677551fb..0257c6c4e1 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.166", + "version": "0.9.167", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 55d23cbea4..fc9165e697 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "0.9.166", + "version": "0.9.167", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 0873727982..7ba9681054 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.166", + "version": "0.9.167", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.166", - "@budibase/client": "^0.9.166", + "@budibase/bbui": "^0.9.167", + "@budibase/client": "^0.9.167", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.166", + "@budibase/string-templates": "^0.9.167", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index e850432d2f..71c8dde283 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.166", + "version": "0.9.167", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index a22036a1a2..f8a970691e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.166", + "version": "0.9.167", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.166", + "@budibase/bbui": "^0.9.167", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^0.9.166", + "@budibase/string-templates": "^0.9.167", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index 19ff1a1c22..3fcf895bbe 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.166", + "version": "0.9.167", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -68,9 +68,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.166", - "@budibase/client": "^0.9.166", - "@budibase/string-templates": "^0.9.166", + "@budibase/auth": "^0.9.167", + "@budibase/client": "^0.9.167", + "@budibase/string-templates": "^0.9.167", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index dcb734eaa8..80ee2a4087 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.166", + "version": "0.9.167", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5aa83d282f..4378763989 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.166", + "version": "0.9.167", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -29,8 +29,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.166", - "@budibase/string-templates": "^0.9.166", + "@budibase/auth": "^0.9.167", + "@budibase/string-templates": "^0.9.167", "@koa/router": "^8.0.0", "@techpass/passport-openidconnect": "^0.3.0", "aws-sdk": "^2.811.0", From 88cdc7c1bdc470fd8de4d77cfa26065e2e06867b Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 14 Oct 2021 16:36:45 +0100 Subject: [PATCH 02/15] Allow options picker to be used on text columns --- .../ComponentSettingsSection.svelte | 1 + .../PropertyControls/FormFieldSelect.svelte | 16 +++++++++++----- .../PropertyControls/PropertyControl.svelte | 2 ++ packages/client/manifest.json | 1 + .../client/src/components/app/forms/Field.svelte | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte b/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte index f047e9316b..ca6f0d24d1 100644 --- a/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte @@ -75,6 +75,7 @@ {#if canRenderControl(setting)} { + const getOptions = (schema, type, fieldTypes) => { let entries = Object.entries(schema ?? {}) - if (fieldType) { - fieldType = fieldType.split("/")[1] - entries = entries.filter(entry => entry[1].type === fieldType) + + // fallback to using only field/options fields + if (!fieldTypes) { + fieldTypes = [type] } + + const types = fieldTypes.map(fieldType => fieldType.split("/")[1]) + entries = entries.filter(entry => types.includes(entry[1].type)) + return entries.map(entry => entry[0]) } diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte index 4ca7d9fc12..193174fb52 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte @@ -13,6 +13,7 @@ export let control = null export let key = "" export let type = "" + export let fieldTypes = [] export let value = null export let props = {} export let onChange = () => {} @@ -82,6 +83,7 @@ name={key} text={label} {type} + {fieldTypes} {...props} /> {#if bindable && !key.startsWith("_") && type === "text"} diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 2e64b1fb4c..f377a3ede4 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -1950,6 +1950,7 @@ "settings": [ { "type": "field/options", + "fieldTypes": ["field/options", "field/string"], "label": "Field", "key": "field" }, diff --git a/packages/client/src/components/app/forms/Field.svelte b/packages/client/src/components/app/forms/Field.svelte index 3eb52420e5..ca607e7315 100644 --- a/packages/client/src/components/app/forms/Field.svelte +++ b/packages/client/src/components/app/forms/Field.svelte @@ -67,7 +67,7 @@ - {:else if fieldSchema?.type && fieldSchema?.type !== type} + {:else if fieldSchema?.type && fieldSchema?.type !== type && type !== "options"} From 39d9017eae0e59798119b3f8a91bb358a705fe15 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Sun, 17 Oct 2021 20:58:06 +0100 Subject: [PATCH 03/15] remove addition of _id and _rev as autocolumns --- packages/bbui/src/Table/CellRenderer.svelte | 2 -- .../backend/DataTable/DataTable.svelte | 21 +------------------ 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/packages/bbui/src/Table/CellRenderer.svelte b/packages/bbui/src/Table/CellRenderer.svelte index 1c3822e51e..11deaa8318 100644 --- a/packages/bbui/src/Table/CellRenderer.svelte +++ b/packages/bbui/src/Table/CellRenderer.svelte @@ -5,7 +5,6 @@ import RelationshipRenderer from "./RelationshipRenderer.svelte" import AttachmentRenderer from "./AttachmentRenderer.svelte" import ArrayRenderer from "./ArrayRenderer.svelte" - import InternalRenderer from "./InternalRenderer.svelte" export let row export let schema @@ -23,7 +22,6 @@ number: StringRenderer, longform: StringRenderer, array: ArrayRenderer, - internal: InternalRenderer, } $: type = schema?.type ?? "string" diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte index f1d23e8f3d..11bf1ee739 100644 --- a/packages/builder/src/components/backend/DataTable/DataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte @@ -16,29 +16,10 @@ import { Pagination } from "@budibase/bbui" let hideAutocolumns = true - let schema $: isUsersTable = $tables.selected?._id === TableNames.USERS $: type = $tables.selected?.type $: isInternal = type !== "external" - $: { - schema = $tables.selected?.schema - - // Manually add these as we don't want them to be 'real' auto-columns - schema._id = { - type: "internal", - editable: false, - displayName: "ID", - autocolumn: true, - } - if (isInternal) { - schema._rev = { - type: "internal", - editable: false, - displayName: "Revision", - autocolumn: true, - } - } - } + $: schema = $tables.selected?.schema $: id = $tables.selected?._id $: search = searchTable(id) $: columnOptions = Object.keys($search.schema || {}) From 6d8f7f1220440f0e1601005e31da376ff44c28df Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Sun, 17 Oct 2021 20:06:43 +0000 Subject: [PATCH 04/15] v0.9.168 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index 7676925b53..ac5ef2c829 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.167", + "version": "0.9.168", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index 0257c6c4e1..9810f8d7c9 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.167", + "version": "0.9.168", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index fc9165e697..9d4fd2f2a0 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "0.9.167", + "version": "0.9.168", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 7ba9681054..6488cf158b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.167", + "version": "0.9.168", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.167", - "@budibase/client": "^0.9.167", + "@budibase/bbui": "^0.9.168", + "@budibase/client": "^0.9.168", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.167", + "@budibase/string-templates": "^0.9.168", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 71c8dde283..ab4f196cbe 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.167", + "version": "0.9.168", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index f8a970691e..7adcb57736 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.167", + "version": "0.9.168", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.167", + "@budibase/bbui": "^0.9.168", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^0.9.167", + "@budibase/string-templates": "^0.9.168", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index 3fcf895bbe..7137f8e961 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.167", + "version": "0.9.168", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -68,9 +68,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.167", - "@budibase/client": "^0.9.167", - "@budibase/string-templates": "^0.9.167", + "@budibase/auth": "^0.9.168", + "@budibase/client": "^0.9.168", + "@budibase/string-templates": "^0.9.168", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 80ee2a4087..fa9ff8932c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.167", + "version": "0.9.168", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 4378763989..f77674a0d1 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.167", + "version": "0.9.168", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -29,8 +29,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.167", - "@budibase/string-templates": "^0.9.167", + "@budibase/auth": "^0.9.168", + "@budibase/string-templates": "^0.9.168", "@koa/router": "^8.0.0", "@techpass/passport-openidconnect": "^0.3.0", "aws-sdk": "^2.811.0", From 9945688584aca20d2412f11d3e796d22dbc403c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20K=C3=A4stner?= <8317993+fabiankaestner@users.noreply.github.com> Date: Mon, 18 Oct 2021 12:56:21 +0200 Subject: [PATCH 05/15] Make multitenancy configurable in values.yaml, set selfHosted by default. --- .../templates/app-service-deployment.yaml | 2 +- .../templates/worker-service-deployment.yaml | 2 +- hosting/kubernetes/budibase/values.yaml | 41 ++++++++++--------- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml b/hosting/kubernetes/budibase/templates/app-service-deployment.yaml index bce532016a..fb26d329a1 100644 --- a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml +++ b/hosting/kubernetes/budibase/templates/app-service-deployment.yaml @@ -77,7 +77,7 @@ spec: - name: PORT value: {{ .Values.services.apps.port | quote }} - name: MULTI_TENANCY - value: "1" + value: {{ .Values.globals.multiTenancy | quote }} - name: REDIS_PASSWORD value: {{ .Values.services.redis.password }} - name: REDIS_URL diff --git a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml b/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml index 563b1b4193..77e8981efc 100644 --- a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml +++ b/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml @@ -74,7 +74,7 @@ spec: - name: PORT value: {{ .Values.services.worker.port | quote }} - name: MULTI_TENANCY - value: "1" + value: {{ .Values.globals.multiTenancy | quote }} - name: REDIS_PASSWORD value: {{ .Values.services.redis.password | quote }} - name: REDIS_URL diff --git a/hosting/kubernetes/budibase/values.yaml b/hosting/kubernetes/budibase/values.yaml index 774f7ea102..bd9f6543b3 100644 --- a/hosting/kubernetes/budibase/values.yaml +++ b/hosting/kubernetes/budibase/values.yaml @@ -24,10 +24,12 @@ serviceAccount: podAnnotations: {} -podSecurityContext: {} +podSecurityContext: + {} # fsGroup: 2000 -securityContext: {} +securityContext: + {} # capabilities: # drop: # - ALL @@ -42,23 +44,24 @@ service: ingress: enabled: false aws: false - nginx: true - certificateArn: "" + nginx: true + certificateArn: "" className: "" - annotations: + annotations: kubernetes.io/ingress.class: nginx hosts: - host: # change if using custom domain paths: - - path: / - pathType: Prefix - backend: - service: - name: proxy-service - port: - number: 10000 + - path: / + pathType: Prefix + backend: + service: + name: proxy-service + port: + number: 10000 -resources: {} +resources: + {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -89,10 +92,11 @@ globals: sentryDSN: "" posthogToken: "" logLevel: info - selfHosted: "" - accountPortalUrl: "" + selfHosted: "1" # set to 0 for budibase cloud environment, set to 1 for self-hosted setup + multiTenancy: "0" # set to 0 to disable multiple orgs, set to 1 to enable multiple orgs + accountPortalUrl: "" accountPortalApiKey: "" - cookieDomain: "" + cookieDomain: "" platformUrl: "" createSecrets: true # creates an internal API key, JWT secrets and redis password for you @@ -128,7 +132,7 @@ services: # password: "" # only change if pointing to existing couch server port: 5984 storage: 100Mi - + redis: enabled: true # disable if using external redis port: 6379 @@ -136,7 +140,7 @@ services: url: "" # only change if pointing to existing redis cluster and enabled: false password: "budibase" # recommended to override if using built-in redis storage: 100Mi - + objectStore: minio: true browser: true @@ -147,4 +151,3 @@ services: region: "" # AWS_REGION if using S3 or existing minio secret url: "" # only change if pointing to existing minio cluster and minio: false storage: 100Mi - From 5242265f0e05650579c42dd032e5fedbae58ea51 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 18 Oct 2021 11:58:42 +0100 Subject: [PATCH 06/15] Code review refactoring --- .../PropertyControls/FormFieldSelect.svelte | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte index 3991390ce6..65b698d779 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte @@ -21,15 +21,18 @@ $: schema = getSchemaForDatasource($currentAsset, datasource, true).schema $: options = getOptions(schema, type, fieldTypes) - const getOptions = (schema, type, fieldTypes) => { + const getOptions = (schema, type) => { let entries = Object.entries(schema ?? {}) - // fallback to using only field/options fields - if (!fieldTypes) { - fieldTypes = [type] + let types = [] + if (type === "field/options") { + // allow options to be used on both options and string fields + types = [type, "field/string"] + } else { + types = [type] } - const types = fieldTypes.map(fieldType => fieldType.split("/")[1]) + types = types.map(type => type.split("/")[1]) entries = entries.filter(entry => types.includes(entry[1].type)) return entries.map(entry => entry[0]) From bd9dbc6644d006745036cb16008e3ced73ba3d56 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 18 Oct 2021 12:02:08 +0100 Subject: [PATCH 07/15] Remove redundant fieldTypes --- .../design/PropertiesPanel/ComponentSettingsSection.svelte | 1 - .../PropertiesPanel/PropertyControls/FormFieldSelect.svelte | 3 +-- .../PropertiesPanel/PropertyControls/PropertyControl.svelte | 2 -- packages/client/manifest.json | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte b/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte index ca6f0d24d1..f047e9316b 100644 --- a/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte @@ -75,7 +75,6 @@ {#if canRenderControl(setting)} { let entries = Object.entries(schema ?? {}) diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte index acfa057b01..91e67c1685 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte @@ -13,7 +13,6 @@ export let control = null export let key = "" export let type = "" - export let fieldTypes = [] export let value = null export let props = {} export let onChange = () => {} @@ -83,7 +82,6 @@ name={key} text={label} {type} - {fieldTypes} {...props} /> {#if bindable && !key.startsWith("_") && type === "text"} diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 393c906a55..2adfd96626 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -1950,7 +1950,6 @@ "settings": [ { "type": "field/options", - "fieldTypes": ["field/options", "field/string"], "label": "Field", "key": "field" }, From 357d8743aa0bd021f2946a161e32bcd9e6805aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20K=C3=A4stner?= <8317993+fabiankaestner@users.noreply.github.com> Date: Mon, 18 Oct 2021 13:02:28 +0200 Subject: [PATCH 08/15] Add default value for minio-service URL --- .../kubernetes/budibase/templates/app-service-deployment.yaml | 4 ++++ .../budibase/templates/worker-service-deployment.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml b/hosting/kubernetes/budibase/templates/app-service-deployment.yaml index fb26d329a1..fcb8278ea5 100644 --- a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml +++ b/hosting/kubernetes/budibase/templates/app-service-deployment.yaml @@ -73,7 +73,11 @@ spec: name: {{ template "budibase.fullname" . }} key: objectStoreSecret - name: MINIO_URL + {{ if .Values.services.objectStore.url }} value: {{ .Values.services.objectStore.url }} + {{ else }} + value: http://minio-service:{{ .Values.services.objectStore.port }} + {{ end }} - name: PORT value: {{ .Values.services.apps.port | quote }} - name: MULTI_TENANCY diff --git a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml b/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml index 77e8981efc..101f0c9605 100644 --- a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml +++ b/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml @@ -70,7 +70,11 @@ spec: name: {{ template "budibase.fullname" . }} key: objectStoreSecret - name: MINIO_URL + {{ if .Values.services.objectStore.url }} value: {{ .Values.services.objectStore.url }} + {{ else }} + value: http://minio-service:{{ .Values.services.objectStore.port }} + {{ end }} - name: PORT value: {{ .Values.services.worker.port | quote }} - name: MULTI_TENANCY From 4717b0d975d8fb79107e8abc9bc5beee8fb20320 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 18 Oct 2021 11:30:09 +0000 Subject: [PATCH 09/15] v0.9.167-alpha.13 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index 923dae4202..8511550696 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.167-alpha.12", + "version": "0.9.167-alpha.13", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index 9c847d5ce5..a53649160b 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.167-alpha.12", + "version": "0.9.167-alpha.13", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 1a0979d540..e1f013bf5d 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "0.9.167-alpha.12", + "version": "0.9.167-alpha.13", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index b262040832..dfaca01767 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.167-alpha.12", + "version": "0.9.167-alpha.13", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.167-alpha.12", - "@budibase/client": "^0.9.167-alpha.12", + "@budibase/bbui": "^0.9.167-alpha.13", + "@budibase/client": "^0.9.167-alpha.13", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.167-alpha.12", + "@budibase/string-templates": "^0.9.167-alpha.13", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 85e71edc63..c6e71776fc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.167-alpha.12", + "version": "0.9.167-alpha.13", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 77197184c3..e5d8fb27ca 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.167-alpha.12", + "version": "0.9.167-alpha.13", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.167-alpha.12", + "@budibase/bbui": "^0.9.167-alpha.13", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^0.9.167-alpha.12", + "@budibase/string-templates": "^0.9.167-alpha.13", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index b637c44d56..6d13cf8e2c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.167-alpha.12", + "version": "0.9.167-alpha.13", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -68,9 +68,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.167-alpha.12", - "@budibase/client": "^0.9.167-alpha.12", - "@budibase/string-templates": "^0.9.167-alpha.12", + "@budibase/auth": "^0.9.167-alpha.13", + "@budibase/client": "^0.9.167-alpha.13", + "@budibase/string-templates": "^0.9.167-alpha.13", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 1a4cdffdb4..fc17f36c1b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.167-alpha.12", + "version": "0.9.167-alpha.13", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5b20130341..7417d3e9af 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.167-alpha.12", + "version": "0.9.167-alpha.13", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -29,8 +29,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.167-alpha.12", - "@budibase/string-templates": "^0.9.167-alpha.12", + "@budibase/auth": "^0.9.167-alpha.13", + "@budibase/string-templates": "^0.9.167-alpha.13", "@koa/router": "^8.0.0", "@techpass/passport-openidconnect": "^0.3.0", "aws-sdk": "^2.811.0", From 9f1d6013b2250924ee549516d0375e9ceba64d8d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 18 Oct 2021 11:44:29 +0000 Subject: [PATCH 10/15] v0.9.167-alpha.14 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index 8511550696..0a75e68460 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.167-alpha.13", + "version": "0.9.167-alpha.14", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index a53649160b..18880b3aa3 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.167-alpha.13", + "version": "0.9.167-alpha.14", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e1f013bf5d..5c0b14a50f 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "0.9.167-alpha.13", + "version": "0.9.167-alpha.14", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index dfaca01767..d2390aa09f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.167-alpha.13", + "version": "0.9.167-alpha.14", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.167-alpha.13", - "@budibase/client": "^0.9.167-alpha.13", + "@budibase/bbui": "^0.9.167-alpha.14", + "@budibase/client": "^0.9.167-alpha.14", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.167-alpha.13", + "@budibase/string-templates": "^0.9.167-alpha.14", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index c6e71776fc..6542dd8a56 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.167-alpha.13", + "version": "0.9.167-alpha.14", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index e5d8fb27ca..95c8371aa3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.167-alpha.13", + "version": "0.9.167-alpha.14", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.167-alpha.13", + "@budibase/bbui": "^0.9.167-alpha.14", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^0.9.167-alpha.13", + "@budibase/string-templates": "^0.9.167-alpha.14", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index 6d13cf8e2c..d709bb290e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.167-alpha.13", + "version": "0.9.167-alpha.14", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -68,9 +68,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.167-alpha.13", - "@budibase/client": "^0.9.167-alpha.13", - "@budibase/string-templates": "^0.9.167-alpha.13", + "@budibase/auth": "^0.9.167-alpha.14", + "@budibase/client": "^0.9.167-alpha.14", + "@budibase/string-templates": "^0.9.167-alpha.14", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index fc17f36c1b..3fd8c7f9e3 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.167-alpha.13", + "version": "0.9.167-alpha.14", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7417d3e9af..7a4e683ccb 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.167-alpha.13", + "version": "0.9.167-alpha.14", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -29,8 +29,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.167-alpha.13", - "@budibase/string-templates": "^0.9.167-alpha.13", + "@budibase/auth": "^0.9.167-alpha.14", + "@budibase/string-templates": "^0.9.167-alpha.14", "@koa/router": "^8.0.0", "@techpass/passport-openidconnect": "^0.3.0", "aws-sdk": "^2.811.0", From 2fb2b570d12963a6842a882304659e753da88561 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 18 Oct 2021 14:57:30 +0100 Subject: [PATCH 11/15] Sentry updates --- hosting/docker-compose.yaml | 2 +- packages/builder/package.json | 2 +- packages/builder/yarn.lock | 72 +-- packages/server/package.json | 2 +- packages/server/yarn.lock | 923 +++------------------------------- packages/worker/package.json | 1 + packages/worker/src/index.js | 15 + packages/worker/yarn.lock | 105 ++++ 8 files changed, 231 insertions(+), 891 deletions(-) diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml index 91b5a7e32a..1b8997bd19 100644 --- a/hosting/docker-compose.yaml +++ b/hosting/docker-compose.yaml @@ -21,7 +21,7 @@ services: PORT: 4002 JWT_SECRET: ${JWT_SECRET} LOG_LEVEL: info - SENTRY_DSN: https://cc54bb0358fd4300ae97ef2273fbaf9f@o420233.ingest.sentry.io/6007553 + SENTRY_DSN: https://a34ae347621946bf8acded18e5b7d4b8@o420233.ingest.sentry.io/5338131 ENABLE_ANALYTICS: "true" REDIS_URL: redis-service:6379 REDIS_PASSWORD: ${REDIS_PASSWORD} diff --git a/packages/builder/package.json b/packages/builder/package.json index d2390aa09f..d27dc9f682 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -69,7 +69,7 @@ "@budibase/client": "^0.9.167-alpha.14", "@budibase/colorpicker": "1.1.2", "@budibase/string-templates": "^0.9.167-alpha.14", - "@sentry/browser": "5.19.1", + "@sentry/browser": "6.0.0", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", "codemirror": "^5.59.0", diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index 443d00680b..55b7061353 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -1206,56 +1206,56 @@ dependencies: any-observable "^0.3.0" -"@sentry/browser@5.19.1": - version "5.19.1" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.19.1.tgz#b22f36fc71f36719ad352a54e6b31722622128c0" - integrity sha512-Aon5Nc2n8sIXKg6Xbr4RM3/Xs7vFpXksL56z3yIuGrmpCM8ToQ25/tQv8h+anYi72x5bn1npzaXB/NwU1Qwfhg== +"@sentry/browser@6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.0.0.tgz#599ba0b64b0fb4045135a7b544dd6876df12e785" + integrity sha512-R4+MHb5FyVZCz3EVnaquvT1mwOM2MWP4gBqjYEADY5m0XWoHiJf0skFkWt8iEKJanzGbhl4PMb9gHuJj6YfVLw== dependencies: - "@sentry/core" "5.19.1" - "@sentry/types" "5.19.1" - "@sentry/utils" "5.19.1" + "@sentry/core" "6.0.0" + "@sentry/types" "6.0.0" + "@sentry/utils" "6.0.0" tslib "^1.9.3" -"@sentry/core@5.19.1": - version "5.19.1" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.19.1.tgz#f5ff7feb1118035f75f1d0bc2a76e2b040d2aa8e" - integrity sha512-BGGxjeT95Og/hloBhQXAVcndVXPmIU6drtF3oKRT12cBpiG965xEDEUwiJVvyb5MAvojdVEZBK2LURUFY/d7Zw== +"@sentry/core@6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.0.0.tgz#831c1737cad10c48a299e6ded4a3b4539657a25b" + integrity sha512-afAiOachs/WfGWc9LsJBFnJMhqQVENyzfSMnf7sLRvxPAw8n7IrXY0R09MKmG0SlAnTKN2pWoQFzFF+J3NuHBA== dependencies: - "@sentry/hub" "5.19.1" - "@sentry/minimal" "5.19.1" - "@sentry/types" "5.19.1" - "@sentry/utils" "5.19.1" + "@sentry/hub" "6.0.0" + "@sentry/minimal" "6.0.0" + "@sentry/types" "6.0.0" + "@sentry/utils" "6.0.0" tslib "^1.9.3" -"@sentry/hub@5.19.1": - version "5.19.1" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.19.1.tgz#f3bc8500680974ce43c1eedcd8e90696cc18b306" - integrity sha512-XjfbNGWVeDsP38alm5Cm08YPIw5Hu6HbPkw7a3y1piViTrg4HdtsE+ZJqq0YcURo2RTpg6Ks6coCS/zJxIPygQ== +"@sentry/hub@6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.0.0.tgz#c0d8cf1d1f19384d1d3f23fe8c00bc6b7134b002" + integrity sha512-s8IsW6LvEH7ACnniQcxxb/9uEyjmoQ/TAoryTJN2qyPzzrHTw8NCyMuJvK+8ivUvRViz5AvtuOFf8AJlh9lzeA== dependencies: - "@sentry/types" "5.19.1" - "@sentry/utils" "5.19.1" + "@sentry/types" "6.0.0" + "@sentry/utils" "6.0.0" tslib "^1.9.3" -"@sentry/minimal@5.19.1": - version "5.19.1" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.19.1.tgz#04043d93a7dc90cbed1a31d80f6bf59688ea3100" - integrity sha512-pgNfsaCroEsC8gv+NqmPTIkj4wyK6ZgYLV12IT4k2oJLkGyg45TSAKabyB7oEP5jsj8sRzm8tDomu8M4HpaCHg== +"@sentry/minimal@6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.0.0.tgz#f38e1325937770c7d038fdde11737e70804eb444" + integrity sha512-daYdEzTr+ERMwViu6RpWHOfk0oZrSNqdx+7bejTqmFHqO4pt+9ZrMiw3vinL+MWQcKXwD95uXBz6O/ryrVdPtg== dependencies: - "@sentry/hub" "5.19.1" - "@sentry/types" "5.19.1" + "@sentry/hub" "6.0.0" + "@sentry/types" "6.0.0" tslib "^1.9.3" -"@sentry/types@5.19.1": - version "5.19.1" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.19.1.tgz#8762f668d3fc2416fbde31d15d13009544caeb54" - integrity sha512-M5MhTLnjqYFwxMwcFPBpBgYQqI9hCvtVuj/A+NvcBHpe7VWOXdn/Sys+zD6C76DWGFYQdw3OWCsZimP24dL8mA== +"@sentry/types@6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.0.0.tgz#250ae7287875bf729eddfe30346611bb11034f47" + integrity sha512-yueRSRGPCahuju/UMdtOt8LIIncbpwLINQd9Q8E4OXtoPpMHR6Oun8sMKCPd+Wq3piI5yRDzKkGCl+sH7mHVrA== -"@sentry/utils@5.19.1": - version "5.19.1" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.19.1.tgz#e1134db40e4bb9732251e515721cec7ee94d4d9c" - integrity sha512-neUiNBnZSHjWTZWy2QV02EHTx1C2L3DBPzRXlh0ca5xrI7LMBLmhkHlhebn1E5ky3PW1teqZTgmh0jZoL99TEA== +"@sentry/utils@6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.0.0.tgz#87a8e7c29c3b05483d31654c106df6b7ed95d10a" + integrity sha512-dMMWOT69bQ4CF1R33dOnXIOyiHRWsUAON3nFVljV1JNNTDA69YwaF9f5FIT0DKpO4qhgTlElsm8WgHI9prAVEQ== dependencies: - "@sentry/types" "5.19.1" + "@sentry/types" "6.0.0" tslib "^1.9.3" "@sideway/address@^4.1.0": diff --git a/packages/server/package.json b/packages/server/package.json index d709bb290e..af387b9639 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -74,7 +74,7 @@ "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", - "@sentry/node": "5.19.2", + "@sentry/node": "^6.0.0", "airtable": "0.10.1", "arangojs": "7.2.0", "aws-sdk": "^2.767.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 9fd402cc35..bcca0c0ad1 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -943,29 +943,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/auth@^0.9.167-alpha.6": - version "0.9.167" - resolved "https://registry.yarnpkg.com/@budibase/auth/-/auth-0.9.167.tgz#a2903d95d91e3d42223c688760f8268395da0470" - integrity sha512-QojloGeNOQK0HaCzID/TyQV8gWRleGQ+y20DjRCS3y20ixd9PcfD2Q7RYji9/WTnToqfO2RNH1TGvchoETGxdQ== - dependencies: - "@techpass/passport-openidconnect" "^0.3.0" - aws-sdk "^2.901.0" - bcryptjs "^2.4.3" - cls-hooked "^4.2.2" - ioredis "^4.27.1" - jsonwebtoken "^8.5.1" - koa-passport "^4.1.4" - lodash "^4.17.21" - node-fetch "^2.6.1" - passport-google-auth "^1.0.2" - passport-google-oauth "^2.0.0" - passport-jwt "^4.0.0" - passport-local "^1.0.0" - sanitize-s3-objectkey "^0.0.1" - tar-fs "^2.1.1" - uuid "^8.3.2" - zlib "^1.0.5" - "@budibase/bbui@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.139.tgz#e6cfc90e8f6c2aa3526fc6a7bef251bccdaf51bb" @@ -1015,94 +992,6 @@ svelte-flatpickr "^3.1.0" svelte-portal "^1.0.0" -"@budibase/bbui@^0.9.167": - version "0.9.167" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.167.tgz#70cfbbed3db99516d3865c340e4fb972342c583e" - integrity sha512-lMaLtU8dePfjEcklulGmTMq6Sw82h5LiqK6F7+Pogw9Qew0TXB/hCp8XNxyWRNEjf38Y2d2x/LrCV5I/yYzp1w== - dependencies: - "@adobe/spectrum-css-workflow-icons" "^1.2.1" - "@spectrum-css/actionbutton" "^1.0.1" - "@spectrum-css/actiongroup" "^1.0.1" - "@spectrum-css/avatar" "^3.0.2" - "@spectrum-css/button" "^3.0.1" - "@spectrum-css/buttongroup" "^3.0.2" - "@spectrum-css/checkbox" "^3.0.2" - "@spectrum-css/dialog" "^3.0.1" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/dropzone" "^3.0.2" - "@spectrum-css/fieldgroup" "^3.0.2" - "@spectrum-css/fieldlabel" "^3.0.1" - "@spectrum-css/icon" "^3.0.1" - "@spectrum-css/illustratedmessage" "^3.0.2" - "@spectrum-css/inputgroup" "^3.0.2" - "@spectrum-css/label" "^2.0.10" - "@spectrum-css/link" "^3.1.1" - "@spectrum-css/menu" "^3.0.1" - "@spectrum-css/modal" "^3.0.1" - "@spectrum-css/pagination" "^3.0.3" - "@spectrum-css/picker" "^1.0.1" - "@spectrum-css/popover" "^3.0.1" - "@spectrum-css/progressbar" "^1.0.2" - "@spectrum-css/progresscircle" "^1.0.2" - "@spectrum-css/radio" "^3.0.2" - "@spectrum-css/search" "^3.0.2" - "@spectrum-css/sidenav" "^3.0.2" - "@spectrum-css/statuslight" "^3.0.2" - "@spectrum-css/stepper" "^3.0.3" - "@spectrum-css/switch" "^1.0.2" - "@spectrum-css/table" "^3.0.1" - "@spectrum-css/tabs" "^3.0.1" - "@spectrum-css/tags" "^3.0.2" - "@spectrum-css/textfield" "^3.0.1" - "@spectrum-css/toast" "^3.0.1" - "@spectrum-css/tooltip" "^3.0.3" - "@spectrum-css/treeview" "^3.0.2" - "@spectrum-css/typography" "^3.0.1" - "@spectrum-css/underlay" "^2.0.9" - "@spectrum-css/vars" "^3.0.1" - dayjs "^1.10.4" - svelte-flatpickr "^3.2.3" - svelte-portal "^1.0.0" - -"@budibase/client@^0.9.167-alpha.6": - version "0.9.167" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.9.167.tgz#fa4875e5cbe3be52c7b73ecbb3bb8a382ea8bfaf" - integrity sha512-eICndIZlB+8TCy2YN0UG3D0TTqGRE2rj/YHQbplAxS+CMcontwgjKP8nPyCdsEJ3PyORUnhzRqAgdGDuoT0E7g== - dependencies: - "@budibase/bbui" "^0.9.167" - "@budibase/standard-components" "^0.9.139" - "@budibase/string-templates" "^0.9.167" - regexparam "^1.3.0" - shortid "^2.2.15" - svelte-spa-router "^3.0.5" - -"@budibase/handlebars-helpers@^0.11.7": - version "0.11.7" - resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.7.tgz#8e5f9843d7dd10503e9f608555a96ccf4d836c46" - integrity sha512-PvGHAv22cWSFExs1kc0WglwsmCEUEOqWvSp6JCFZwtc3qAAr5yMfLK8WGVQ63ALvyzWZiyxF+yrlzeeaohCMJw== - dependencies: - array-sort "^1.0.0" - define-property "^2.0.2" - extend-shallow "^3.0.2" - for-in "^1.0.2" - get-object "^0.2.0" - get-value "^3.0.1" - handlebars "^4.7.7" - handlebars-utils "^1.0.6" - has-value "^2.0.2" - 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.1" - kind-of "^6.0.3" - micromatch "^3.1.5" - relative "^3.0.2" - striptags "^3.1.1" - to-gfm-code-block "^0.1.1" - year "^0.2.1" - "@budibase/standard-components@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" @@ -1121,17 +1010,6 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@^0.9.167", "@budibase/string-templates@^0.9.167-alpha.6": - version "0.9.167" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.167.tgz#4ed9ea48c60a369bc56b4ca19e4f9cf283ceacf4" - integrity sha512-xKpdxcWIGD7ZARFZ90OQOzQoAzk3u/XtXDApId5P2gO2FsvA2yUnKAXo5bKiXFIChcbTc2BBORb1D6VWrhqjhw== - dependencies: - "@budibase/handlebars-helpers" "^0.11.7" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1826,83 +1704,72 @@ "@sendgrid/client" "^7.1.1" "@sendgrid/helpers" "^7.0.1" -"@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== +"@sentry/core@6.13.3": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.13.3.tgz#5cbbb995128e793ebebcbf1d3b7514e0e5e8b221" + integrity sha512-obm3SjgCk8A7nB37b2AU1eq1q7gMoJRrGMv9VRIyfcG0Wlz/5lJ9O3ohUk+YZaaVfZMxXn6hFtsBiOWmlv7IIA== dependencies: - "@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" + "@sentry/hub" "6.13.3" + "@sentry/minimal" "6.13.3" + "@sentry/types" "6.13.3" + "@sentry/utils" "6.13.3" tslib "^1.9.3" -"@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== +"@sentry/hub@6.13.3": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.13.3.tgz#cc09623a69b5343315fdb61c7fdd0be74b72299f" + integrity sha512-eYppBVqvhs5cvm33snW2sxfcw6G20/74RbBn+E4WDo15hozis89kU7ZCJDOPkXuag3v1h9igns/kM6PNBb41dw== dependencies: - "@sentry/core" "5.19.2" - "@sentry/types" "5.19.2" - "@sentry/utils" "5.19.2" + "@sentry/types" "6.13.3" + "@sentry/utils" "6.13.3" tslib "^1.9.3" -"@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== +"@sentry/minimal@6.13.3": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.13.3.tgz#a675a79bcc830142e4f95e6198a2efde2cd3901e" + integrity sha512-63MlYYRni3fs5Bh8XBAfVZ+ctDdWg0fapSTP1ydIC37fKvbE+5zhyUqwrEKBIiclEApg1VKX7bkKxVdu/vsFdw== dependencies: - "@sentry/hub" "5.19.2" - "@sentry/minimal" "5.19.2" - "@sentry/types" "5.19.2" - "@sentry/utils" "5.19.2" + "@sentry/hub" "6.13.3" + "@sentry/types" "6.13.3" tslib "^1.9.3" -"@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== +"@sentry/node@^6.0.0": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.13.3.tgz#94c646c31fd240ab68ee8b85aa663e65eb499d06" + integrity sha512-ZeZSw+TcPcf4e0j7iEqNMtoVmz+WFW/TEoGokXIwysZqSgchKdAXDHqn+CqUqFan7d76JcJmzztAUK2JruQ2Kg== dependencies: - "@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" + "@sentry/core" "6.13.3" + "@sentry/hub" "6.13.3" + "@sentry/tracing" "6.13.3" + "@sentry/types" "6.13.3" + "@sentry/utils" "6.13.3" + cookie "^0.4.1" https-proxy-agent "^5.0.0" lru_map "^0.3.3" 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/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== +"@sentry/tracing@6.13.3": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.13.3.tgz#ca657d4afa99c50f15e638fe38405bac33e780ee" + integrity sha512-yyOFIhqlprPM0g4f35Icear3eZk2mwyYcGEzljJfY2iU6pJwj1lzia5PfSwiCW7jFGMmlBJNhOAIpfhlliZi8Q== dependencies: - "@sentry/types" "5.19.2" + "@sentry/hub" "6.13.3" + "@sentry/minimal" "6.13.3" + "@sentry/types" "6.13.3" + "@sentry/utils" "6.13.3" + tslib "^1.9.3" + +"@sentry/types@6.13.3": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.13.3.tgz#63ad5b6735b0dfd90b3a256a9f8e77b93f0f66b2" + integrity sha512-Vrz5CdhaTRSvCQjSyIFIaV9PodjAVFkzJkTRxyY7P77RcegMsRSsG1yzlvCtA99zG9+e6MfoJOgbOCwuZids5A== + +"@sentry/utils@6.13.3": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.13.3.tgz#188754d40afe693c3fcae410f9322531588a9926" + integrity sha512-zYFuFH3MaYtBZTeJ4Yajg7pDf0pM3MWs3+9k5my9Fd+eqNcl7dYQYJbT9gyC0HXK1QI4CAMNNlHNl4YXhF91ag== + dependencies: + "@sentry/types" "6.13.3" tslib "^1.9.3" "@sindresorhus/is@^0.14.0": @@ -2145,17 +2012,6 @@ dependencies: defer-to-connect "^1.0.1" -"@techpass/passport-openidconnect@^0.3.0": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@techpass/passport-openidconnect/-/passport-openidconnect-0.3.2.tgz#f8fd5d97256286665dbf26dac92431f977ab1e63" - integrity sha512-fnCtEiexXSHA029B//hJcCJlLJrT3lhpNCyA0rnz58Qttz0BLGCVv6yMT8HmOnGThH6vcDOVwdgKM3kbCQtEhw== - dependencies: - base64url "^3.0.1" - oauth "^0.9.15" - passport-strategy "^1.0.0" - request "^2.88.0" - webfinger "^0.4.2" - "@tootallnate/once@1": version "1.1.2" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" @@ -2802,7 +2658,7 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.10, argparse@^1.0.7: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -2849,15 +2705,6 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= -array-sort@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" - integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== - dependencies: - default-compare "^1.0.0" - get-value "^2.0.6" - kind-of "^5.0.2" - array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -2900,13 +2747,6 @@ astral-regex@^1.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== -async-hook-jl@^1.7.6: - version "1.7.6" - resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68" - integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg== - dependencies: - stack-chain "^1.3.7" - async-limiter@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" @@ -2924,13 +2764,6 @@ async@^2.6.3: dependencies: lodash "^4.17.14" -async@~2.1.4: - version "2.1.5" - resolved "https://registry.yarnpkg.com/async/-/async-2.1.5.tgz#e587c68580994ac67fc56ff86d3ac56bdbe810bc" - integrity sha1-5YfGhYCZSsZ/xW/4bTrFa9voELw= - dependencies: - lodash "^4.14.0" - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -2946,13 +2779,6 @@ atomic-sleep@^1.0.0: resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== -autolinker@~0.28.0: - version "0.28.1" - resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" - integrity sha1-BlK0kYgYefB3XazgzcoyM5QqTkc= - dependencies: - gulp-header "^1.7.1" - aws-sdk@^2.767.0: version "2.981.0" resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.981.0.tgz#b2e6205db23d755e1c8fcbd0618e8309e69d3767" @@ -2968,21 +2794,6 @@ aws-sdk@^2.767.0: uuid "3.3.2" xml2js "0.4.19" -aws-sdk@^2.901.0: - version "2.1008.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1008.0.tgz#0f6b58ef6093afec2027a49c0696bec52bb79ef6" - integrity sha512-wBEon+ARCuMcwEPpOFZqRT3elBLfLtPqv8jMql3Hsr7Ua5toPlgKMmjf368iTzBNaY7TOZsjLAT9nAhvtSZ++g== - dependencies: - buffer "4.9.2" - events "1.1.1" - ieee754 "1.1.13" - jmespath "0.15.0" - querystring "0.2.0" - sax "1.2.1" - url "0.10.3" - uuid "3.3.2" - xml2js "0.4.19" - aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -3157,11 +2968,6 @@ base64-js@^1.0.2, base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -base64url@3.x.x, base64url@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d" - integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A== - base@^0.11.1: version "0.11.2" resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" @@ -3182,7 +2988,7 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -bcryptjs@2.4.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= @@ -3227,15 +3033,6 @@ bl@^3.0.0: dependencies: readable-stream "^3.0.1" -bl@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - bluebird@^3.5.1: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" @@ -3605,11 +3402,6 @@ chokidar@^3.2.2: optionalDependencies: fsevents "~2.3.2" -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" @@ -3682,15 +3474,6 @@ clone-response@1.0.2, clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" -cls-hooked@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908" - integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw== - dependencies: - async-hook-jl "^1.7.6" - emitter-listener "^1.0.1" - semver "^5.4.1" - cluster-key-slot@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d" @@ -3812,13 +3595,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-with-sourcemaps@*: - version "1.1.0" - resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" - integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== - dependencies: - source-map "^0.6.1" - configstore@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" @@ -3860,10 +3636,10 @@ cookie@0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== -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= +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== cookiejar@^2.1.0: version "2.1.2" @@ -4035,13 +3811,6 @@ date-utils@*: resolved "https://registry.yarnpkg.com/date-utils/-/date-utils-1.2.21.tgz#61fb16cdc1274b3c9acaaffe9fc69df8720a2b64" integrity sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q= -date.js@^0.3.1: - version "0.3.3" - resolved "https://registry.yarnpkg.com/date.js/-/date.js-0.3.3.tgz#ef1e92332f507a638795dbb985e951882e50bbda" - integrity sha512-HgigOS3h3k6HnW011nAb43c5xx5rBXk8P2v/WIT9Zv4koIaVXiH2BURguI78VVp+5Qc076T7OR378JViCnZtBw== - dependencies: - debug "~3.1.0" - dateformat@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" @@ -4185,13 +3954,6 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -default-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" - integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== - dependencies: - kind-of "^5.0.2" - default-shell@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/default-shell/-/default-shell-1.0.1.tgz#752304bddc6174f49eb29cb988feea0b8813c8bc" @@ -4431,13 +4193,6 @@ electron-to-chromium@^1.3.811: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.827.tgz#c725e8db8c5be18b472a919e5f57904512df0fc1" integrity sha512-ye+4uQOY/jbjRutMcE/EmOcNwUeo1qo9aKL2tPyb09cU3lmxNeyDF4RWiemmkknW+p29h7dyDqy02higTxc9/A== -emitter-listener@^1.0.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8" - integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ== - dependencies: - shimmer "^1.2.0" - emittery@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" @@ -4468,7 +4223,7 @@ encoding-down@^6.3.0: level-codec "^9.0.0" level-errors "^2.0.0" -end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: +end-of-stream@^1.0.0, end-of-stream@^1.1.0: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== @@ -4482,11 +4237,6 @@ end-stream@~0.1.0: dependencies: write-stream "~0.4.3" -ent@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= - errno@~0.1.1: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" @@ -5307,11 +5057,6 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-exists-sync@^0.1.0: - version "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: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -5368,14 +5113,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: has "^1.0.3" has-symbols "^1.0.1" -get-object@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" - integrity sha1-2S/31RkMZFMM2gVD2sY6PUf+jAw= - dependencies: - is-number "^2.0.2" - isobject "^0.2.0" - get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -5423,13 +5160,6 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= -get-value@^3.0.0, get-value@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" - integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== - dependencies: - isobject "^3.0.1" - getopts@2.2.5: version "2.2.5" resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz#67a0fe471cacb9c687d817cab6450b96dde8313b" @@ -5519,32 +5249,6 @@ globby@^11.0.3: merge2 "^1.3.0" slash "^3.0.0" -google-auth-library@~0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-0.10.0.tgz#6e15babee85fd1dd14d8d128a295b6838d52136e" - integrity sha1-bhW6vuhf0d0U2NEoopW2g41SE24= - dependencies: - gtoken "^1.2.1" - jws "^3.1.4" - lodash.noop "^3.0.1" - request "^2.74.0" - -google-p12-pem@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-0.1.2.tgz#33c46ab021aa734fa0332b3960a9a3ffcb2f3177" - integrity sha1-M8RqsCGqc0+gMys5YKmj/8svMXc= - dependencies: - node-forge "^0.7.1" - -googleapis@^16.0.0: - version "16.1.0" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-16.1.0.tgz#0f19f2d70572d918881a0f626e3b1a2fa8629576" - integrity sha1-Dxny1wVy2RiIGg9ibjsaL6hilXY= - dependencies: - async "~2.1.4" - google-auth-library "~0.10.0" - string-template "~1.0.0" - got@^8.3.1: version "8.3.2" resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937" @@ -5590,45 +5294,6 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1. resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== -gtoken@^1.2.1: - version "1.2.3" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-1.2.3.tgz#5509571b8afd4322e124cf66cf68115284c476d8" - integrity sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w== - dependencies: - google-p12-pem "^0.1.0" - jws "^3.0.0" - mime "^1.4.1" - request "^2.72.0" - -gulp-header@^1.7.1: - version "1.8.12" - resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" - integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== - dependencies: - concat-with-sourcemaps "*" - lodash.template "^4.4.0" - through2 "^2.0.0" - -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" - integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== - dependencies: - kind-of "^6.0.0" - typeof-article "^0.1.1" - -handlebars@^4.7.6, handlebars@^4.7.7: - version "4.7.7" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" - integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== - dependencies: - minimist "^1.2.5" - neo-async "^2.6.0" - source-map "^0.6.1" - wordwrap "^1.0.0" - optionalDependencies: - uglify-js "^3.1.4" - har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -5699,14 +5364,6 @@ has-value@^1.0.0: has-values "^1.0.0" isobject "^3.0.0" -has-value@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658" - integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA== - dependencies: - get-value "^3.0.0" - has-values "^2.0.1" - has-values@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" @@ -5720,13 +5377,6 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has-values@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d" - integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w== - dependencies: - kind-of "^6.0.2" - has-yarn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" @@ -5739,39 +5389,6 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -helper-date@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/helper-date/-/helper-date-1.0.1.tgz#12fedea3ad8e44a7ca4c4efb0ff4104a5120cffb" - integrity sha512-wU3VOwwTJvGr/w5rZr3cprPHO+hIhlblTJHD6aFBrKLuNbf4lAmkawd2iK3c6NbJEvY7HAmDpqjOFSI5/+Ey2w== - dependencies: - date.js "^0.3.1" - handlebars-utils "^1.0.4" - moment "^2.18.1" - -helper-markdown@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/helper-markdown/-/helper-markdown-1.0.0.tgz#ee7e9fc554675007d37eb90f7853b13ce74f3e10" - integrity sha512-AnDqMS4ejkQK0MXze7pA9TM3pu01ZY+XXsES6gEE0RmCGk5/NIfvTn0NmItfyDOjRAzyo9z6X7YHbHX4PzIvOA== - dependencies: - handlebars-utils "^1.0.2" - highlight.js "^9.12.0" - remarkable "^1.7.1" - -helper-md@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" - integrity sha1-wfWdflW7riM2L9ig6XFgeuxp1B8= - dependencies: - ent "^2.2.0" - extend-shallow "^2.0.1" - fs-exists-sync "^0.1.0" - remarkable "^1.6.2" - -highlight.js@^9.12.0: - version "9.18.5" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825" - integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA== - hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -5801,14 +5418,6 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-tag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" - integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== - dependencies: - is-self-closing "^1.0.1" - kind-of "^6.0.0" - http-assert@^1.3.0: version "1.5.0" resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f" @@ -6092,23 +5701,6 @@ ioredis@^4.27.0: redis-parser "^3.0.0" standard-as-callback "^2.1.0" -ioredis@^4.27.1: - version "4.28.0" - resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.28.0.tgz#5a2be3f37ff2075e2332f280eaeb02ab4d9ff0d3" - integrity sha512-I+zkeeWp3XFgPT2CtJKxvaF5FjGBGt4yGYljRjQecdQKteThuAsKqffeF1lgHVlYnuNeozRbPOCDNZ7tDWPeig== - dependencies: - cluster-key-slot "^1.1.0" - debug "^4.3.1" - denque "^1.1.0" - lodash.defaults "^4.2.0" - lodash.flatten "^4.4.0" - lodash.isarguments "^3.1.0" - p-map "^2.1.0" - redis-commands "1.7.0" - redis-errors "^1.2.0" - redis-parser "^3.0.0" - standard-as-callback "^2.1.0" - ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -6240,13 +5832,6 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== -is-even@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" - integrity sha1-drUFX7rY0pSoa2qUkBXhyXtxfAY= - dependencies: - is-odd "^0.1.2" - is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -6336,13 +5921,6 @@ is-number-object@^1.0.4: dependencies: has-tostringtag "^1.0.0" -is-number@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= - dependencies: - kind-of "^3.0.2" - is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -6365,13 +5943,6 @@ is-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== -is-odd@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" - integrity sha1-vFc7XONx7yqtbm9JeZtyvvE5eKc= - dependencies: - is-number "^3.0.0" - is-path-inside@^3.0.1: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -6407,13 +5978,6 @@ is-retry-allowed@^1.1.0: resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== -is-self-closing@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" - integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== - dependencies: - self-closing-tags "^1.0.1" - is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -6489,11 +6053,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -isobject@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" - integrity sha1-o0MhkvObkQtfAsyYlIeDbscKqF4= - isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -7494,22 +7053,6 @@ jsonschema@1.4.0: resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.0.tgz#1afa34c4bc22190d8e42271ec17ac8b3404f87b2" integrity sha512-/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw== -jsonwebtoken@^8.2.0, 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== - dependencies: - jws "^3.2.2" - lodash.includes "^4.3.0" - lodash.isboolean "^3.0.3" - lodash.isinteger "^4.0.4" - lodash.isnumber "^3.0.3" - lodash.isplainobject "^4.0.6" - lodash.isstring "^4.0.1" - lodash.once "^4.0.0" - ms "^2.1.1" - semver "^5.6.0" - jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -7549,7 +7092,7 @@ jwa@^1.4.1: ecdsa-sig-formatter "1.0.11" safe-buffer "^5.0.1" -jws@3.x.x, jws@^3.0.0, jws@^3.1.4, jws@^3.2.2: +jws@3.x.x: version "3.2.2" resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304" integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA== @@ -7576,7 +7119,7 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= @@ -7590,12 +7133,12 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0, kind-of@^5.0.2: +kind-of@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: +kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -7674,13 +7217,6 @@ 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-passport@^4.1.4: - version "4.1.4" - resolved "https://registry.yarnpkg.com/koa-passport/-/koa-passport-4.1.4.tgz#5f1665c1c2a37ace79af9f970b770885ca30ccfa" - integrity sha512-dJBCkl4X+zdYxbI2V2OtoGy0PUenpvp2ZLLWObc8UJhsId0iQpTFT8RVcuA0709AL2txGwRHnSPoT1bYNGa6Kg== - dependencies: - passport "^0.4.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" @@ -7962,11 +7498,6 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -7982,46 +7513,16 @@ lodash.flatten@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= -lodash.includes@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" - integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8= - lodash.isarguments@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= -lodash.isboolean@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" - integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= - lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= -lodash.isinteger@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" - integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M= - -lodash.isnumber@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" - integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w= - -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= - -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= - lodash.keys@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205" @@ -8032,21 +7533,11 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.noop@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash.noop/-/lodash.noop-3.0.1.tgz#38188f4d650a3a474258439b96ec45b32617133c" - integrity sha1-OBiPTWUKOkdCWEObluxFsyYXEzw= - lodash.omit@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA= -lodash.once@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" - integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= - lodash.pick@^4.0.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" @@ -8057,21 +7548,6 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= -lodash.template@^4.4.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" - integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.templatesettings "^4.0.0" - -lodash.templatesettings@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" - integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.without@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac" @@ -8082,7 +7558,7 @@ 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.21, lodash@4.x, lodash@^4.14.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0: +lodash@4.17.21, lodash@4.x, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -8252,7 +7728,7 @@ methods@^1.0.1, methods@^1.1.1, methods@^1.1.2, methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.5: +micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -8341,11 +7817,6 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp-classic@^0.5.2: - version "0.5.3" - resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" - integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== - mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" @@ -8365,7 +7836,7 @@ moment-timezone@^0.5.31: dependencies: moment ">= 2.9.0" -"moment@>= 2.9.0", moment@^2.18.1: +"moment@>= 2.9.0": version "2.29.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== @@ -8459,11 +7930,6 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== -nanoid@^2.1.0: - version "2.1.11" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" - integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -8511,11 +7977,6 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -neo-async@^2.6.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -8536,11 +7997,6 @@ node-fetch@^2.6.0, node-fetch@^2.6.1: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== -node-forge@^0.7.1: - version "0.7.6" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac" - integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw== - node-gyp-build@~4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb" @@ -8652,11 +8108,6 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -oauth@0.9.x, oauth@^0.9.15: - version "0.9.15" - resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1" - integrity sha1-vR/vr2hslrdUda7VGWQS/2DPucE= - object-assign@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa" @@ -8954,84 +8405,6 @@ pascalcase@^0.1.1: resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= -passport-google-auth@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/passport-google-auth/-/passport-google-auth-1.0.2.tgz#8b300b5aa442ef433de1d832ed3112877d0b2938" - integrity sha1-izALWqRC70M94dgy7TESh30LKTg= - dependencies: - googleapis "^16.0.0" - passport-strategy "1.x" - -passport-google-oauth1@1.x.x: - version "1.0.0" - resolved "https://registry.yarnpkg.com/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz#af74a803df51ec646f66a44d82282be6f108e0cc" - integrity sha1-r3SoA99R7GRvZqRNgigr5vEI4Mw= - dependencies: - passport-oauth1 "1.x.x" - -passport-google-oauth20@2.x.x: - version "2.0.0" - resolved "https://registry.yarnpkg.com/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz#0d241b2d21ebd3dc7f2b60669ec4d587e3a674ef" - integrity sha512-KSk6IJ15RoxuGq7D1UKK/8qKhNfzbLeLrG3gkLZ7p4A6DBCcv7xpyQwuXtWdpyR0+E0mwkpjY1VfPOhxQrKzdQ== - dependencies: - passport-oauth2 "1.x.x" - -passport-google-oauth@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/passport-google-oauth/-/passport-google-oauth-2.0.0.tgz#f6eb4bc96dd6c16ec0ecfdf4e05ec48ca54d4dae" - integrity sha512-JKxZpBx6wBQXX1/a1s7VmdBgwOugohH+IxCy84aPTZNq/iIPX6u7Mqov1zY7MKRz3niFPol0KJz8zPLBoHKtYA== - dependencies: - passport-google-oauth1 "1.x.x" - passport-google-oauth20 "2.x.x" - -passport-jwt@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/passport-jwt/-/passport-jwt-4.0.0.tgz#7f0be7ba942e28b9f5d22c2ebbb8ce96ef7cf065" - integrity sha512-BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg== - dependencies: - jsonwebtoken "^8.2.0" - passport-strategy "^1.0.0" - -passport-local@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/passport-local/-/passport-local-1.0.0.tgz#1fe63268c92e75606626437e3b906662c15ba6ee" - integrity sha1-H+YyaMkudWBmJkN+O5BmYsFbpu4= - dependencies: - passport-strategy "1.x.x" - -passport-oauth1@1.x.x: - version "1.2.0" - resolved "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.2.0.tgz#5229d431781bf5b265bec86ce9a9cce58a756cf9" - integrity sha512-Sv2YWodC6jN12M/OXwmR4BIXeeIHjjbwYTQw4kS6tHK4zYzSEpxBgSJJnknBjICA5cj0ju3FSnG1XmHgIhYnLg== - dependencies: - oauth "0.9.x" - passport-strategy "1.x.x" - utils-merge "1.x.x" - -passport-oauth2@1.x.x: - version "1.6.1" - resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b" - integrity sha512-ZbV43Hq9d/SBSYQ22GOiglFsjsD1YY/qdiptA+8ej+9C1dL1TVB+mBE5kDH/D4AJo50+2i8f4bx0vg4/yDDZCQ== - dependencies: - base64url "3.x.x" - oauth "0.9.x" - passport-strategy "1.x.x" - uid2 "0.0.x" - utils-merge "1.x.x" - -passport-strategy@1.x, passport-strategy@1.x.x, passport-strategy@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4" - integrity sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ= - -passport@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270" - integrity sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg== - dependencies: - passport-strategy "1.x.x" - pause "0.0.1" - path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -9086,11 +8459,6 @@ path-type@^4.0.0: resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== -pause@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d" - integrity sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10= - pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" @@ -9803,7 +9171,7 @@ readable-stream@1.1.14, readable-stream@^1.0.27-1: isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.0.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -9937,16 +9305,6 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexparam@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.0.tgz#059476767d5f5f87f735fc7922d133fd1a118c8c" - integrity sha512-gJKwd2MVPWHAIFLsaYDZfyKzHNS4o7E/v8YmNf44vmeV2e4YfVoDToTOKTvE7ab68cRJ++kLuEXJBaEeJVt5ow== - -regexparam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" - integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== - regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" @@ -9990,21 +9348,6 @@ regjsparser@^0.6.4: dependencies: jsesc "~0.5.0" -relative@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" - integrity sha1-Dc2OxUpdNaPBXhBFA9ZTdbWlNn8= - dependencies: - isobject "^2.0.0" - -remarkable@^1.6.2, remarkable@^1.7.1: - version "1.7.4" - resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" - integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== - dependencies: - argparse "^1.0.10" - autolinker "~0.28.0" - remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -10041,7 +9384,7 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@^2.72.0, request@^2.74.0, request@^2.87.0, request@^2.88.0: +request@^2.87.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -10233,11 +9576,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -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== - saslprep@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226" @@ -10250,7 +9588,7 @@ sax@1.2.1: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" integrity sha1-e45lYZCyKOgaZq6nSEgNgozS03o= -sax@>=0.1.1, sax@>=0.6.0, sax@^1.2.4: +sax@>=0.6.0, sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -10274,11 +9612,6 @@ seek-bzip@^1.0.5: dependencies: commander "^2.8.1" -self-closing-tags@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" - integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== - semver-diff@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" @@ -10286,7 +9619,7 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -10412,18 +9745,6 @@ shell-path@^2.1.0: dependencies: shell-env "^0.3.0" -shimmer@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" - integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== - -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== - dependencies: - nanoid "^2.1.0" - side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -10668,11 +9989,6 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -stack-chain@^1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285" - integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU= - stack-utils@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.5.tgz#a19b0b01947e0029c8e451d5d61a498f5bb1471b" @@ -10715,11 +10031,6 @@ stealthy-require@^1.1.1: resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= -step@0.0.x: - version "0.0.6" - resolved "https://registry.yarnpkg.com/step/-/step-0.0.6.tgz#143e7849a5d7d3f4a088fe29af94915216eeede2" - integrity sha1-FD54SaXX0/SgiP4pr5SRUhbu7eI= - strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" @@ -10733,11 +10044,6 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -string-template@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/string-template/-/string-template-1.0.0.tgz#9e9f2233dc00f218718ec379a28a5673ecca8b96" - integrity sha1-np8iM9wA8hhxjsN5oopWc+zKi5Y= - string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -10863,11 +10169,6 @@ strip-outer@^1.0.0: dependencies: escape-string-regexp "^1.0.2" -striptags@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" - integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== - sublevel-pouchdb@7.2.2: version "7.2.2" resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.2.2.tgz#49e46cd37883bf7ff5006d7c5b9bcc7bcc1f422f" @@ -10952,25 +10253,11 @@ svelte-flatpickr@^3.1.0: dependencies: flatpickr "^4.5.2" -svelte-flatpickr@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.2.3.tgz#db5dd7ad832ef83262b45e09737955ad3d591fc8" - integrity sha512-PNkqK4Napx8nTvCwkaUXdnKo8dISThaxEOK+szTUXcY6H0dQM0TSyuoMaVWY2yX7pM+PN5cpCQCcVe8YvTRFSw== - dependencies: - flatpickr "^4.5.2" - svelte-portal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== -svelte-spa-router@^3.0.5: - version "3.2.0" - resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.2.0.tgz#fae3311d292451236cb57131262406cf312b15ee" - integrity sha512-igemo5Vs82TGBBw+DjWt6qKameXYzNs6aDXcTxou5XbEvOjiRcAM6MLkdVRCatn6u8r42dE99bt/br7T4qe/AQ== - dependencies: - regexparam "2.0.0" - svelte@^3.38.2: version "3.42.4" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.42.4.tgz#838ed98fa7b26fc5fffe4df0d7ba345f1c54cf4f" @@ -11046,16 +10333,6 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -tar-fs@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - tar-stream@^1.5.2: version "1.6.2" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" @@ -11069,17 +10346,6 @@ tar-stream@^1.5.2: to-buffer "^1.1.1" xtend "^4.0.0" -tar-stream@^2.1.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" - integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - tarn@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/tarn/-/tarn-1.1.5.tgz#7be88622e951738b9fa3fb77477309242cdddc2d" @@ -11251,11 +10517,6 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= -to-gfm-code-block@^0.1.1: - version "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: version "0.2.5" resolved "https://registry.yarnpkg.com/to-json-schema/-/to-json-schema-0.2.5.tgz#ef3c3f11ad64460dcfbdbafd0fd525d69d62a98f" @@ -11467,28 +10728,11 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typeof-article@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" - integrity sha1-nwfnM8P7tkb/qeYcCN66zUYOBq8= - dependencies: - kind-of "^3.1.0" - typescript@^4.3.5: version "4.3.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== -uglify-js@^3.1.4: - version "3.14.2" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.2.tgz#d7dd6a46ca57214f54a2d0a43cad0f35db82ac99" - integrity sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A== - -uid2@0.0.x: - version "0.0.4" - resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz#033f3b1d5d32505f5ce5f888b9f3b667123c0a44" - integrity sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA== - unbox-primitive@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" @@ -11680,7 +10924,7 @@ util.promisify@^1.0.0, util.promisify@^1.0.1: has-symbols "^1.0.1" object.getownpropertydescriptors "^2.1.1" -utils-merge@1.0.1, utils-merge@1.x.x: +utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= @@ -11782,14 +11026,6 @@ walker@^1.0.7, walker@~1.0.5: dependencies: makeerror "1.0.x" -webfinger@^0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/webfinger/-/webfinger-0.4.2.tgz#3477a6d97799461896039fcffc650b73468ee76d" - integrity sha1-NHem2XeZRhiWA5/P/GULc0aO520= - dependencies: - step "0.0.x" - xml2js "0.1.x" - webidl-conversions@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" @@ -11886,11 +11122,6 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= - wrap-ansi@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" @@ -11989,13 +11220,6 @@ xml-parse-from-string@^1.0.0: resolved "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz#a9029e929d3dbcded169f3c6e28238d95a5d5a28" integrity sha1-qQKekp09vN7RafPG4oI42VpdWig= -xml2js@0.1.x: - version "0.1.14" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.1.14.tgz#5274e67f5a64c5f92974cd85139e0332adc6b90c" - integrity sha1-UnTmf1pkxfkpdM2FE54DMq3GuQw= - dependencies: - sax ">=0.1.1" - xml2js@0.4.19: version "0.4.19" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" @@ -12134,11 +11358,6 @@ yauzl@^2.4.2: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -year@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" - integrity sha1-QIOuUgoxiyPshgN/MADLiSvfm7A= - ylru@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.2.1.tgz#f576b63341547989c1de7ba288760923b27fe84f" @@ -12149,7 +11368,7 @@ yn@3.1.1: resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== -zlib@1.0.5, 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/worker/package.json b/packages/worker/package.json index 7a4e683ccb..83865534e1 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -54,6 +54,7 @@ "pino-pretty": "^4.0.0", "pouchdb": "^7.2.1", "pouchdb-all-dbs": "^1.0.2", + "@sentry/node": "^6.0.0", "server-destroy": "^1.0.1" }, "devDependencies": { diff --git a/packages/worker/src/index.js b/packages/worker/src/index.js index 8af1380552..77430268cd 100644 --- a/packages/worker/src/index.js +++ b/packages/worker/src/index.js @@ -11,6 +11,7 @@ const logger = require("koa-pino-logger") const http = require("http") const api = require("./api") const redis = require("./utilities/redis") +const Sentry = require("@sentry/node") const app = new Koa() @@ -36,6 +37,20 @@ app.use(passport.session()) // api routes app.use(api.routes()) +// sentry +if (env.isProd()) { + Sentry.init() + + app.on("error", (err, ctx) => { + Sentry.withScope(function (scope) { + scope.addEventProcessor(function (event) { + return Sentry.Handlers.parseRequest(event, ctx.request) + }) + Sentry.captureException(err) + }) + }) +} + const server = http.createServer(app.callback()) destroyable(server) diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index ab206dcf18..5d4b175422 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -511,6 +511,74 @@ path-to-regexp "1.x" urijs "^1.19.2" +"@sentry/core@6.13.3": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.13.3.tgz#5cbbb995128e793ebebcbf1d3b7514e0e5e8b221" + integrity sha512-obm3SjgCk8A7nB37b2AU1eq1q7gMoJRrGMv9VRIyfcG0Wlz/5lJ9O3ohUk+YZaaVfZMxXn6hFtsBiOWmlv7IIA== + dependencies: + "@sentry/hub" "6.13.3" + "@sentry/minimal" "6.13.3" + "@sentry/types" "6.13.3" + "@sentry/utils" "6.13.3" + tslib "^1.9.3" + +"@sentry/hub@6.13.3": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.13.3.tgz#cc09623a69b5343315fdb61c7fdd0be74b72299f" + integrity sha512-eYppBVqvhs5cvm33snW2sxfcw6G20/74RbBn+E4WDo15hozis89kU7ZCJDOPkXuag3v1h9igns/kM6PNBb41dw== + dependencies: + "@sentry/types" "6.13.3" + "@sentry/utils" "6.13.3" + tslib "^1.9.3" + +"@sentry/minimal@6.13.3": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.13.3.tgz#a675a79bcc830142e4f95e6198a2efde2cd3901e" + integrity sha512-63MlYYRni3fs5Bh8XBAfVZ+ctDdWg0fapSTP1ydIC37fKvbE+5zhyUqwrEKBIiclEApg1VKX7bkKxVdu/vsFdw== + dependencies: + "@sentry/hub" "6.13.3" + "@sentry/types" "6.13.3" + tslib "^1.9.3" + +"@sentry/node@^6.0.0": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.13.3.tgz#94c646c31fd240ab68ee8b85aa663e65eb499d06" + integrity sha512-ZeZSw+TcPcf4e0j7iEqNMtoVmz+WFW/TEoGokXIwysZqSgchKdAXDHqn+CqUqFan7d76JcJmzztAUK2JruQ2Kg== + dependencies: + "@sentry/core" "6.13.3" + "@sentry/hub" "6.13.3" + "@sentry/tracing" "6.13.3" + "@sentry/types" "6.13.3" + "@sentry/utils" "6.13.3" + cookie "^0.4.1" + https-proxy-agent "^5.0.0" + lru_map "^0.3.3" + tslib "^1.9.3" + +"@sentry/tracing@6.13.3": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.13.3.tgz#ca657d4afa99c50f15e638fe38405bac33e780ee" + integrity sha512-yyOFIhqlprPM0g4f35Icear3eZk2mwyYcGEzljJfY2iU6pJwj1lzia5PfSwiCW7jFGMmlBJNhOAIpfhlliZi8Q== + dependencies: + "@sentry/hub" "6.13.3" + "@sentry/minimal" "6.13.3" + "@sentry/types" "6.13.3" + "@sentry/utils" "6.13.3" + tslib "^1.9.3" + +"@sentry/types@6.13.3": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.13.3.tgz#63ad5b6735b0dfd90b3a256a9f8e77b93f0f66b2" + integrity sha512-Vrz5CdhaTRSvCQjSyIFIaV9PodjAVFkzJkTRxyY7P77RcegMsRSsG1yzlvCtA99zG9+e6MfoJOgbOCwuZids5A== + +"@sentry/utils@6.13.3": + version "6.13.3" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.13.3.tgz#188754d40afe693c3fcae410f9322531588a9926" + integrity sha512-zYFuFH3MaYtBZTeJ4Yajg7pDf0pM3MWs3+9k5my9Fd+eqNcl7dYQYJbT9gyC0HXK1QI4CAMNNlHNl4YXhF91ag== + dependencies: + "@sentry/types" "6.13.3" + tslib "^1.9.3" + "@sideway/address@^4.1.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.0.tgz#0b301ada10ac4e0e3fa525c90615e0b61a72b78d" @@ -797,6 +865,13 @@ acorn@^8.1.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.1.tgz#fb0026885b9ac9f48bac1e185e4af472971149ff" integrity sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g== +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + ajv@^6.12.3: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -1526,6 +1601,11 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.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== + cookiejar@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" @@ -1619,6 +1699,13 @@ dateformat@^3.0.3: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== +debug@4: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -2560,6 +2647,14 @@ http2-wrapper@^1.0.0-beta.5.2: quick-lru "^5.1.1" resolve-alpn "^1.0.0" +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + human-signals@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" @@ -3855,6 +3950,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru_map@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" + integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0= + ltgt@2.2.1, ltgt@^2.1.2, ltgt@~2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5" @@ -5681,6 +5781,11 @@ tr46@^2.0.2: dependencies: punycode "^2.1.1" +tslib@^1.9.3: + version "1.14.1" + 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" From 0fd21aba5bd8de2b15cf67f5c0cc0d45e44ef12f Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 18 Oct 2021 15:05:55 +0100 Subject: [PATCH 12/15] Add SENTRY_DSN to worker --- hosting/docker-compose.yaml | 1 + .../budibase/templates/worker-service-deployment.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml index 1b8997bd19..66b24f4e49 100644 --- a/hosting/docker-compose.yaml +++ b/hosting/docker-compose.yaml @@ -48,6 +48,7 @@ services: COUCH_DB_USERNAME: ${COUCH_DB_USER} COUCH_DB_PASSWORD: ${COUCH_DB_PASSWORD} COUCH_DB_URL: http://${COUCH_DB_USER}:${COUCH_DB_PASSWORD}@couchdb-service:5984 + SENTRY_DSN: https://a34ae347621946bf8acded18e5b7d4b8@o420233.ingest.sentry.io/5338131 INTERNAL_API_KEY: ${INTERNAL_API_KEY} REDIS_URL: redis-service:6379 REDIS_PASSWORD: ${REDIS_PASSWORD} diff --git a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml b/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml index 101f0c9605..1a2825a2b5 100644 --- a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml +++ b/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml @@ -89,6 +89,8 @@ spec: {{ end }} - name: SELF_HOSTED value: {{ .Values.globals.selfHosted | quote }} + - name: SENTRY_DSN + value: {{ .Values.globals.sentryDSN }} - name: ACCOUNT_PORTAL_URL value: {{ .Values.globals.accountPortalUrl | quote }} - name: ACCOUNT_PORTAL_API_KEY From 355447140cc1742c56e3370ebf087902fa065877 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 18 Oct 2021 16:27:14 +0100 Subject: [PATCH 13/15] release latest helm chart --- docs/budibase-0.2.1.tgz | Bin 0 -> 40795 bytes docs/index.yaml | 44 +++++++++++++++++++++---- hosting/kubernetes/budibase/Chart.yaml | 2 +- 3 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 docs/budibase-0.2.1.tgz diff --git a/docs/budibase-0.2.1.tgz b/docs/budibase-0.2.1.tgz new file mode 100644 index 0000000000000000000000000000000000000000..f3423763a5e9f8246b7f0c0789f4b522b205ee8b GIT binary patch literal 40795 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 literal 0 HcmV?d00001 diff --git a/docs/index.yaml b/docs/index.yaml index b050330477..8aa6769207 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -3,7 +3,7 @@ entries: budibase: - apiVersion: v2 appVersion: 0.9.163 - created: "2021-10-12T21:58:00.515555+01:00" + created: "2021-10-18T16:25:04.374924613+01:00" dependencies: - condition: services.couchdb.enabled name: couchdb @@ -13,7 +13,35 @@ entries: name: ingress-nginx repository: https://github.com/kubernetes/ingress-nginx version: 3.35.0 - description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes. + description: Budibase is an open source low-code platform, helping thousands of + teams build apps for their workplace in minutes. + digest: ebac6d8631cc38b266c3689508b5123f5afc395f23bdb02738be26c7cae0b0b5 + keywords: + - low-code + - database + - cluster + name: budibase + sources: + - https://github.com/Budibase/budibase + - https://budibase.com + type: application + urls: + - https://budibase.github.io/budibase/budibase-0.2.1.tgz + version: 0.2.1 + - apiVersion: v2 + appVersion: 0.9.163 + created: "2021-10-18T16:25:04.36936805+01:00" + dependencies: + - condition: services.couchdb.enabled + name: couchdb + repository: https://apache.github.io/couchdb-helm + version: 3.3.4 + - condition: ingress.nginx + name: ingress-nginx + repository: https://github.com/kubernetes/ingress-nginx + version: 3.35.0 + description: Budibase is an open source low-code platform, helping thousands of + teams build apps for their workplace in minutes. digest: f369536c0eac1f6959d51e8ce6d74a87a7a9df29ae84fb9cbed0a273ab77429b keywords: - low-code @@ -29,7 +57,7 @@ entries: version: 0.2.0 - apiVersion: v2 appVersion: 0.9.56 - created: "2021-10-12T21:58:00.512062+01:00" + created: "2021-10-18T16:25:04.36360616+01:00" dependencies: - condition: services.couchdb.enabled name: couchdb @@ -38,7 +66,8 @@ entries: - name: ingress-nginx repository: https://github.com/kubernetes/ingress-nginx version: 3.35.0 - description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes. + description: Budibase is an open source low-code platform, helping thousands of + teams build apps for their workplace in minutes. digest: 8dc4f2ed4d98cad5adf25936aefea680042d3e4e17832f846b961fd8708ad192 keywords: - low-code @@ -54,7 +83,7 @@ entries: version: 0.1.1 - apiVersion: v2 appVersion: 0.9.56 - created: "2021-10-12T21:58:00.507257+01:00" + created: "2021-10-18T16:25:04.354504201+01:00" dependencies: - condition: services.couchdb.enabled name: couchdb @@ -63,7 +92,8 @@ entries: - name: ingress-nginx repository: https://github.com/kubernetes/ingress-nginx version: 3.35.0 - description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes. + description: Budibase is an open source low-code platform, helping thousands of + teams build apps for their workplace in minutes. digest: 08031b0803cce0eff64472e569d454d9176119c8207aa9873a9c95ee66cc7d3f keywords: - low-code @@ -77,4 +107,4 @@ entries: urls: - https://budibase.github.io/budibase/budibase-0.1.0.tgz version: 0.1.0 -generated: "2021-10-12T21:58:00.503447+01:00" +generated: "2021-10-18T16:25:04.346266269+01:00" diff --git a/hosting/kubernetes/budibase/Chart.yaml b/hosting/kubernetes/budibase/Chart.yaml index fa652ed28f..6849d2712c 100644 --- a/hosting/kubernetes/budibase/Chart.yaml +++ b/hosting/kubernetes/budibase/Chart.yaml @@ -22,7 +22,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.0 +version: 0.2.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From 6325a5868683084251cdcc417fa75f2a99438df8 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 18 Oct 2021 16:29:03 +0100 Subject: [PATCH 14/15] Remove sentry dsn from build --- .github/workflows/release-develop.yml | 1 - .github/workflows/release-selfhost.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 9389c5bd66..57bd5a9640 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -9,7 +9,6 @@ env: POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }} INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }} POSTHOG_URL: ${{ secrets.POSTHOG_URL }} - SENTRY_DSN: ${{ secrets.SENTRY_DSN_SELF_HOST }} jobs: release: diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index 14283aff8f..7ec2725a7f 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -7,7 +7,6 @@ env: POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }} INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }} POSTHOG_URL: ${{ secrets.POSTHOG_URL }} - SENTRY_DSN: ${{ secrets.SENTRY_DSN_SELF_HOST }} jobs: release: From 1d5494a7f5eb7a6e9d942c4aa5da9cff4bca9648 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 18 Oct 2021 15:44:36 +0000 Subject: [PATCH 15/15] v0.9.169-alpha.0 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 8 ++++---- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lerna.json b/lerna.json index ac5ef2c829..06d2dce5ce 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.168", + "version": "0.9.169-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index 9810f8d7c9..fe58d9ab57 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.168", + "version": "0.9.169-alpha.0", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 9d4fd2f2a0..05a47f7c12 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "0.9.168", + "version": "0.9.169-alpha.0", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index c074550504..d1b0964fd8 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.168", + "version": "0.9.169-alpha.0", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.168", - "@budibase/client": "^0.9.168", + "@budibase/bbui": "^0.9.169-alpha.0", + "@budibase/client": "^0.9.169-alpha.0", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.168", + "@budibase/string-templates": "^0.9.169-alpha.0", "@sentry/browser": "6.0.0", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index ab4f196cbe..c4a31136ff 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.168", + "version": "0.9.169-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 7adcb57736..938a5b0374 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.168", + "version": "0.9.169-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.168", + "@budibase/bbui": "^0.9.169-alpha.0", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^0.9.168", + "@budibase/string-templates": "^0.9.169-alpha.0", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index f01defeee6..1bb29d65de 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.168", + "version": "0.9.169-alpha.0", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -68,9 +68,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.168", - "@budibase/client": "^0.9.168", - "@budibase/string-templates": "^0.9.168", + "@budibase/auth": "^0.9.169-alpha.0", + "@budibase/client": "^0.9.169-alpha.0", + "@budibase/string-templates": "^0.9.169-alpha.0", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b4b15dba6f..92aaa5e0db 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.168", + "version": "0.9.169-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index cdd6f7401e..02cb87e0ae 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.168", + "version": "0.9.169-alpha.0", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -29,9 +29,10 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.168", - "@budibase/string-templates": "^0.9.168", + "@budibase/auth": "^0.9.169-alpha.0", + "@budibase/string-templates": "^0.9.169-alpha.0", "@koa/router": "^8.0.0", + "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0", "aws-sdk": "^2.811.0", "bcryptjs": "^2.4.3", @@ -54,7 +55,6 @@ "pino-pretty": "^4.0.0", "pouchdb": "^7.2.1", "pouchdb-all-dbs": "^1.0.2", - "@sentry/node": "^6.0.0", "server-destroy": "^1.0.1" }, "devDependencies": {