appOverview(app)}>
+
appOverview(app)}>
{app.name}
diff --git a/packages/builder/src/components/start/ExportAppModal.svelte b/packages/builder/src/components/start/ExportAppModal.svelte
new file mode 100644
index 0000000000..05a42dfa4a
--- /dev/null
+++ b/packages/builder/src/components/start/ExportAppModal.svelte
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js
index 922955591a..8851cba771 100644
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@@ -184,6 +184,7 @@ export const IntegrationTypes = {
GOOGLE_SHEETS: "GOOGLE_SHEETS",
FIREBASE: "FIREBASE",
REDIS: "REDIS",
+ SNOWFLAKE: "SNOWFLAKE",
}
export const IntegrationNames = {
@@ -203,6 +204,7 @@ export const IntegrationNames = {
[IntegrationTypes.GOOGLE_SHEETS]: "Google Sheets",
[IntegrationTypes.FIREBASE]: "Firebase",
[IntegrationTypes.REDIS]: "Redis",
+ [IntegrationTypes.SNOWFLAKE]: "Snowflake",
}
export const SchemaTypeOptions = [
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 2685881973..2892a9b723 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -17,6 +17,7 @@
import CreateAppModal from "components/start/CreateAppModal.svelte"
import UpdateAppModal from "components/start/UpdateAppModal.svelte"
import ChooseIconModal from "components/start/ChooseIconModal.svelte"
+ import ExportAppModal from "components/start/ExportAppModal.svelte"
import { store, automationStore } from "builderStore"
import { API } from "api"
@@ -37,6 +38,7 @@
let updatingModal
let deletionModal
let unpublishModal
+ let exportModal
let iconModal
let creatingApp = false
let loaded = $apps?.length || $templates?.length
@@ -200,9 +202,8 @@
}
const exportApp = app => {
- const id = app.deployed ? app.prodId : app.devId
- const appName = encodeURIComponent(app.name)
- window.location = `/api/backups/export?appId=${id}&appname=${appName}`
+ exportModal.show()
+ selectedApp = app
}
const unpublishApp = app => {
@@ -457,6 +458,10 @@
+
+
+
+
{#if isPublished}
-
@@ -305,6 +299,7 @@
app={selectedApp}
deployments={latestDeployments}
navigateTab={handleTabChange}
+ on:unpublish={e => unpublishApp(e.detail)}
/>
{#if false}
diff --git a/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte b/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte
index ae5189543c..7b7258cada 100644
--- a/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte
@@ -13,10 +13,12 @@
import clientPackage from "@budibase/client/package.json"
import { processStringSync } from "@budibase/string-templates"
import { users, auth } from "stores/portal"
+ import { createEventDispatcher } from "svelte"
export let app
export let deployments
export let navigateTab
+ const dispatch = createEventDispatcher()
const userInit = async () => {
try {
@@ -26,6 +28,10 @@
}
}
+ const unpublishApp = () => {
+ dispatch("unpublish", app)
+ }
+
let userPromise = userInit()
$: updateAvailable = clientPackage.version !== $store.version
@@ -72,6 +78,9 @@
new Date(deployments[0].updatedAt).getTime(),
}
)}
+ {#if isPublished}
+ - Unpublish
+ {/if}
{/if}
{#if !deployments?.length}
-
diff --git a/packages/cli/package.json b/packages/cli/package.json
index ceb67ee6cd..ab5f051b18 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
- "version": "1.0.185-alpha.5",
+ "version": "1.0.192-alpha.5",
"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 92269a67d9..0cae72268f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@budibase/client",
- "version": "1.0.185-alpha.5",
+ "version": "1.0.192-alpha.5",
"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": "^1.0.185-alpha.5",
- "@budibase/frontend-core": "^1.0.185-alpha.5",
- "@budibase/string-templates": "^1.0.185-alpha.5",
+ "@budibase/bbui": "^1.0.192-alpha.5",
+ "@budibase/frontend-core": "^1.0.192-alpha.5",
+ "@budibase/string-templates": "^1.0.192-alpha.5",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",
diff --git a/packages/client/src/utils/schema.js b/packages/client/src/utils/schema.js
index fba25e384a..46c352a29f 100644
--- a/packages/client/src/utils/schema.js
+++ b/packages/client/src/utils/schema.js
@@ -1,5 +1,4 @@
import { API } from "api"
-import { JSONUtils } from "@budibase/frontend-core"
import TableFetch from "@budibase/frontend-core/src/fetch/TableFetch.js"
import ViewFetch from "@budibase/frontend-core/src/fetch/ViewFetch.js"
import QueryFetch from "@budibase/frontend-core/src/fetch/QueryFetch.js"
@@ -40,44 +39,41 @@ export const fetchDatasourceSchema = async (
return null
}
- // Check for any JSON fields so we can add any top level properties
- let jsonAdditions = {}
- Object.keys(schema).forEach(fieldKey => {
+ // Enrich schema with relationships if required
+ if (definition?.sql && options?.enrichRelationships) {
+ const relationshipAdditions = await getRelationshipSchemaAdditions(schema)
+ schema = {
+ ...schema,
+ ...relationshipAdditions,
+ }
+ }
+
+ // Ensure schema is in the correct structure
+ return instance.enrichSchema(schema)
+}
+
+/**
+ * Fetches the schema of relationship fields for a SQL table schema
+ * @param schema the schema to enrich
+ */
+export const getRelationshipSchemaAdditions = async schema => {
+ if (!schema) {
+ return null
+ }
+ let relationshipAdditions = {}
+ for (let fieldKey of Object.keys(schema)) {
const fieldSchema = schema[fieldKey]
- if (fieldSchema?.type === "json") {
- const jsonSchema = JSONUtils.convertJSONSchemaToTableSchema(fieldSchema, {
- squashObjects: true,
+ if (fieldSchema?.type === "link") {
+ const linkSchema = await fetchDatasourceSchema({
+ type: "table",
+ tableId: fieldSchema?.tableId,
})
- Object.keys(jsonSchema).forEach(jsonKey => {
- jsonAdditions[`${fieldKey}.${jsonKey}`] = {
- type: jsonSchema[jsonKey].type,
- nestedJSON: true,
+ Object.keys(linkSchema || {}).forEach(linkKey => {
+ relationshipAdditions[`${fieldKey}.${linkKey}`] = {
+ type: linkSchema[linkKey].type,
}
})
}
- })
- schema = { ...schema, ...jsonAdditions }
-
- // Check for any relationship fields if required
- if (options?.enrichRelationships && definition.sql) {
- let relationshipAdditions = {}
- for (let fieldKey of Object.keys(schema)) {
- const fieldSchema = schema[fieldKey]
- if (fieldSchema?.type === "link") {
- const linkSchema = await fetchDatasourceSchema({
- type: "table",
- tableId: fieldSchema?.tableId,
- })
- Object.keys(linkSchema || {}).forEach(linkKey => {
- relationshipAdditions[`${fieldKey}.${linkKey}`] = {
- type: linkSchema[linkKey].type,
- }
- })
- }
- }
- schema = { ...schema, ...relationshipAdditions }
}
-
- // Ensure schema structure is correct
- return instance.enrichSchema(schema)
+ return relationshipAdditions
}
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 2c66653750..1c8fa7b9a9 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
{
"name": "@budibase/frontend-core",
- "version": "1.0.185-alpha.5",
+ "version": "1.0.192-alpha.5",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
- "@budibase/bbui": "^1.0.185-alpha.5",
+ "@budibase/bbui": "^1.0.192-alpha.5",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}
diff --git a/packages/frontend-core/src/fetch/DataFetch.js b/packages/frontend-core/src/fetch/DataFetch.js
index 3455ee132b..ecd5313af5 100644
--- a/packages/frontend-core/src/fetch/DataFetch.js
+++ b/packages/frontend-core/src/fetch/DataFetch.js
@@ -6,6 +6,7 @@ import {
runLuceneQuery,
luceneSort,
} from "../utils/lucene"
+import { convertJSONSchemaToTableSchema } from "../utils/json"
/**
* Parent class which handles the implementation of fetching data from an
@@ -248,7 +249,8 @@ export default class DataFetch {
}
/**
- * Enriches the schema and ensures that entries are objects with names
+ * Enriches a datasource schema with nested fields and ensures the structure
+ * is correct.
* @param schema the datasource schema
* @return {object} the enriched datasource schema
*/
@@ -256,6 +258,26 @@ export default class DataFetch {
if (schema == null) {
return null
}
+
+ // Check for any JSON fields so we can add any top level properties
+ let jsonAdditions = {}
+ Object.keys(schema).forEach(fieldKey => {
+ const fieldSchema = schema[fieldKey]
+ if (fieldSchema?.type === "json") {
+ const jsonSchema = convertJSONSchemaToTableSchema(fieldSchema, {
+ squashObjects: true,
+ })
+ Object.keys(jsonSchema).forEach(jsonKey => {
+ jsonAdditions[`${fieldKey}.${jsonKey}`] = {
+ type: jsonSchema[jsonKey].type,
+ nestedJSON: true,
+ }
+ })
+ }
+ })
+ schema = { ...schema, ...jsonAdditions }
+
+ // Ensure schema is in the correct structure
let enrichedSchema = {}
Object.entries(schema).forEach(([fieldName, fieldSchema]) => {
if (typeof fieldSchema === "string") {
@@ -270,6 +292,7 @@ export default class DataFetch {
}
}
})
+
return enrichedSchema
}
diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile
index e5063a88ed..f70fdbca95 100644
--- a/packages/server/Dockerfile
+++ b/packages/server/Dockerfile
@@ -1,7 +1,5 @@
FROM node:14-slim
-RUN apt-get update
-
LABEL com.centurylinklabs.watchtower.lifecycle.pre-check="scripts/watchtower-hooks/pre-check.sh"
LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="scripts/watchtower-hooks/pre-update.sh"
LABEL com.centurylinklabs.watchtower.lifecycle.post-update="scripts/watchtower-hooks/post-update.sh"
@@ -15,7 +13,13 @@ ENV BUDIBASE_ENVIRONMENT=PRODUCTION
# copy files and install dependencies
COPY . ./
-RUN yarn
+# handle node-gyp
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends g++ make python \
+ && yarn \
+ && yarn cache clean \
+ && apt-get remove -y --purge --auto-remove g++ make python \
+ && rm -rf /tmp/* /root/.node-gyp /usr/local/lib/node_modules/npm/node_modules/node-gyp
RUN yarn global add pm2
RUN yarn build
diff --git a/packages/server/docker_run.sh b/packages/server/docker_run.sh
index 0045fe0c44..d40e84177a 100755
--- a/packages/server/docker_run.sh
+++ b/packages/server/docker_run.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
if [ -z $CLUSTER_MODE ]; then
yarn run:docker
else
diff --git a/packages/server/package.json b/packages/server/package.json
index 35ac5e6c69..080aa6ee26 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
- "version": "1.0.185-alpha.5",
+ "version": "1.0.192-alpha.5",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@@ -70,10 +70,10 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "^10.0.3",
- "@budibase/backend-core": "^1.0.185-alpha.5",
- "@budibase/client": "^1.0.185-alpha.5",
- "@budibase/pro": "1.0.185-alpha.5",
- "@budibase/string-templates": "^1.0.185-alpha.5",
+ "@budibase/backend-core": "^1.0.192-alpha.5",
+ "@budibase/client": "^1.0.192-alpha.5",
+ "@budibase/pro": "1.0.192-alpha.5",
+ "@budibase/string-templates": "^1.0.192-alpha.5",
"@bull-board/api": "^3.7.0",
"@bull-board/koa": "^3.7.0",
"@elastic/elasticsearch": "7.10.0",
@@ -130,6 +130,7 @@
"pouchdb-replication-stream": "1.2.9",
"redis": "4",
"server-destroy": "1.0.1",
+ "snowflake-promise": "^4.5.0",
"svelte": "^3.38.2",
"swagger-parser": "^10.0.3",
"to-json-schema": "0.2.5",
diff --git a/packages/server/src/api/controllers/backup.js b/packages/server/src/api/controllers/backup.js
index daaa59b341..0ebf01176e 100644
--- a/packages/server/src/api/controllers/backup.js
+++ b/packages/server/src/api/controllers/backup.js
@@ -1,9 +1,11 @@
const { streamBackup } = require("../../utilities/fileSystem")
exports.exportAppDump = async function (ctx) {
- const { appId } = ctx.query
+ let { appId, excludeRows } = ctx.query
const appName = decodeURI(ctx.query.appname)
+ excludeRows = excludeRows === "true"
const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt`
ctx.attachment(backupIdentifier)
- ctx.body = await streamBackup(appId)
+
+ ctx.body = await streamBackup(appId, excludeRows)
}
diff --git a/packages/server/src/api/controllers/row/utils.js b/packages/server/src/api/controllers/row/utils.js
index 9bea800d63..5da7ca331e 100644
--- a/packages/server/src/api/controllers/row/utils.js
+++ b/packages/server/src/api/controllers/row/utils.js
@@ -64,6 +64,9 @@ exports.validate = async ({ tableId, row, table }) => {
// Validate.js doesn't seem to handle array
if (type === FieldTypes.ARRAY && row[fieldName]) {
if (row[fieldName].length) {
+ if (!Array.isArray(row[fieldName])) {
+ row[fieldName] = row[fieldName].split(",")
+ }
row[fieldName].map(val => {
if (
!constraints.inclusion.includes(val) &&
diff --git a/packages/server/src/api/index.js b/packages/server/src/api/index.js
index 4bf9d9e14d..1aae78cb30 100644
--- a/packages/server/src/api/index.js
+++ b/packages/server/src/api/index.js
@@ -12,6 +12,7 @@ const { mainRoutes, staticRoutes, publicRoutes } = require("./routes")
const pkg = require("../../package.json")
const env = require("../environment")
const { middleware: pro } = require("@budibase/pro")
+const { shutdown } = require("./routes/public")
const router = new Router()
@@ -90,4 +91,5 @@ router.use(publicRoutes.allowedMethods())
router.use(staticRoutes.routes())
router.use(staticRoutes.allowedMethods())
-module.exports = router
+module.exports.router = router
+module.exports.shutdown = shutdown
diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts
index 6f1c69560e..ca49a1a7d6 100644
--- a/packages/server/src/api/routes/public/index.ts
+++ b/packages/server/src/api/routes/public/index.ts
@@ -29,6 +29,7 @@ function getApiLimitPerSecond(): number {
return parseInt(env.API_REQ_LIMIT_PER_SEC)
}
+let rateLimitStore: any = null
if (!env.isTest()) {
const REDIS_OPTS = getRedisOptions()
let options
@@ -47,8 +48,9 @@ if (!env.isTest()) {
database: 1,
}
}
+ rateLimitStore = new Stores.Redis(options)
RateLimit.defaultOptions({
- store: new Stores.Redis(options),
+ store: rateLimitStore,
})
}
// rate limiting, allows for 2 requests per second
@@ -128,3 +130,10 @@ applyRoutes(queryEndpoints, PermissionTypes.QUERY, "queryId")
applyRoutes(rowEndpoints, PermissionTypes.TABLE, "tableId", "rowId")
export default publicRouter
+
+export const shutdown = () => {
+ if (rateLimitStore) {
+ rateLimitStore.client.disconnect()
+ rateLimitStore = null
+ }
+}
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 8efc383194..f73c90c895 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -14,6 +14,8 @@ const automations = require("./automations/index")
const Sentry = require("@sentry/node")
const fileSystem = require("./utilities/fileSystem")
const bullboard = require("./automations/bullboard")
+const { logAlert } = require("@budibase/backend-core/logging")
+const { Thread } = require("./threads")
import redis from "./utilities/redis"
import * as migrations from "./migrations"
@@ -49,7 +51,7 @@ app.context.eventEmitter = eventEmitter
app.context.auth = {}
// api routes
-app.use(api.routes())
+app.use(api.router.routes())
if (env.isProd()) {
env._set("NODE_ENV", "production")
@@ -68,11 +70,24 @@ if (env.isProd()) {
const server = http.createServer(app.callback())
destroyable(server)
+let shuttingDown = false,
+ errCode = 0
server.on("close", async () => {
- if (env.NODE_ENV !== "jest") {
+ // already in process
+ if (shuttingDown) {
+ return
+ }
+ shuttingDown = true
+ if (!env.isTest()) {
console.log("Server Closed")
}
+ await automations.shutdown()
await redis.shutdown()
+ await Thread.shutdown()
+ api.shutdown()
+ if (!env.isTest()) {
+ process.exit(errCode)
+ }
})
module.exports = server.listen(env.PORT || 0, async () => {
@@ -90,7 +105,13 @@ const shutdown = () => {
}
process.on("uncaughtException", err => {
- console.error(err)
+ // @ts-ignore
+ // don't worry about this error, comes from zlib isn't important
+ if (err && err["code"] === "ERR_INVALID_CHAR") {
+ return
+ }
+ errCode = -1
+ logAlert("Uncaught exception.", err)
shutdown()
})
@@ -102,7 +123,7 @@ process.on("SIGTERM", () => {
// not recommended in a clustered environment
if (!env.HTTP_MIGRATIONS) {
migrations.migrate().catch(err => {
- console.error("Error performing migrations. Exiting.\n", err)
+ logAlert("Error performing migrations. Exiting.", err)
shutdown()
})
}
diff --git a/packages/server/src/automations/bullboard.js b/packages/server/src/automations/bullboard.js
index 32336c4714..cba6594ae7 100644
--- a/packages/server/src/automations/bullboard.js
+++ b/packages/server/src/automations/bullboard.js
@@ -45,4 +45,12 @@ exports.init = () => {
return serverAdapter.registerPlugin()
}
+exports.shutdown = async () => {
+ if (automationQueue) {
+ clearInterval(cleanupInternal)
+ await automationQueue.close()
+ automationQueue = null
+ }
+}
+
exports.queue = automationQueue
diff --git a/packages/server/src/automations/index.js b/packages/server/src/automations/index.js
index 87f35ce763..e543365183 100644
--- a/packages/server/src/automations/index.js
+++ b/packages/server/src/automations/index.js
@@ -1,5 +1,5 @@
const { processEvent } = require("./utils")
-const { queue } = require("./bullboard")
+const { queue, shutdown } = require("./bullboard")
/**
* This module is built purely to kick off the worker farm and manage the inputs/outputs
@@ -14,4 +14,9 @@ exports.init = function () {
exports.getQueues = () => {
return [queue]
}
+
+exports.shutdown = () => {
+ return shutdown()
+}
+
exports.queue = queue
diff --git a/packages/server/src/db/utils.js b/packages/server/src/db/utils.js
index 280596928b..3fe4a3de73 100644
--- a/packages/server/src/db/utils.js
+++ b/packages/server/src/db/utils.js
@@ -74,6 +74,7 @@ exports.isDevAppID = isDevAppID
exports.isProdAppID = isProdAppID
exports.USER_METDATA_PREFIX = `${DocumentTypes.ROW}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`
exports.LINK_USER_METADATA_PREFIX = `${DocumentTypes.LINK}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`
+exports.TABLE_ROW_PREFIX = `${DocumentTypes.ROW}${SEPARATOR}${DocumentTypes.TABLE}`
exports.ViewNames = ViewNames
exports.InternalTables = InternalTables
exports.DocumentTypes = DocumentTypes
diff --git a/packages/server/src/definitions/datasource.ts b/packages/server/src/definitions/datasource.ts
index 23266991ee..f7f98c22e9 100644
--- a/packages/server/src/definitions/datasource.ts
+++ b/packages/server/src/definitions/datasource.ts
@@ -50,6 +50,7 @@ export enum SourceNames {
GOOGLE_SHEETS = "GOOGLE_SHEETS",
FIREBASE = "FIREBASE",
REDIS = "REDIS",
+ SNOWFLAKE = "SNOWFLAKE",
}
export enum IncludeRelationships {
diff --git a/packages/server/src/integrations/index.ts b/packages/server/src/integrations/index.ts
index f3e7a5fc3a..af45ae5aff 100644
--- a/packages/server/src/integrations/index.ts
+++ b/packages/server/src/integrations/index.ts
@@ -12,6 +12,7 @@ const rest = require("./rest")
const googlesheets = require("./googlesheets")
const firebase = require("./firebase")
const redis = require("./redis")
+const snowflake = require("./snowflake")
const { SourceNames } = require("../definitions/datasource")
const environment = require("../environment")
@@ -29,6 +30,7 @@ const DEFINITIONS = {
[SourceNames.REST]: rest.schema,
[SourceNames.FIREBASE]: firebase.schema,
[SourceNames.REDIS]: redis.schema,
+ [SourceNames.SNOWFLAKE]: snowflake.schema,
}
const INTEGRATIONS = {
@@ -47,6 +49,7 @@ const INTEGRATIONS = {
[SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
[SourceNames.REDIS]: redis.integration,
[SourceNames.FIREBASE]: firebase.integration,
+ [SourceNames.SNOWFLAKE]: snowflake.integration,
}
// optionally add oracle integration if the oracle binary can be installed
diff --git a/packages/server/src/integrations/snowflake.ts b/packages/server/src/integrations/snowflake.ts
new file mode 100644
index 0000000000..711647e5df
--- /dev/null
+++ b/packages/server/src/integrations/snowflake.ts
@@ -0,0 +1,98 @@
+import { Integration, QueryTypes, SqlQuery } from "../definitions/datasource"
+import { Snowflake } from "snowflake-promise"
+
+module SnowflakeModule {
+ interface SnowflakeConfig {
+ account: string
+ username: string
+ password: string
+ warehouse: string
+ database: string
+ schema: string
+ }
+
+ const SCHEMA: Integration = {
+ docs: "https://developers.snowflake.com/",
+ description:
+ "Snowflake is a solution for data warehousing, data lakes, data engineering, data science, data application development, and securely sharing and consuming shared data.",
+ friendlyName: "Snowflake",
+ datasource: {
+ account: {
+ type: "string",
+ required: true,
+ },
+ username: {
+ type: "string",
+ required: true,
+ },
+ password: {
+ type: "password",
+ required: true,
+ },
+ warehouse: {
+ type: "string",
+ required: true,
+ },
+ database: {
+ type: "string",
+ required: true,
+ },
+ schema: {
+ type: "string",
+ required: true,
+ },
+ },
+ query: {
+ create: {
+ type: QueryTypes.SQL,
+ },
+ read: {
+ type: QueryTypes.SQL,
+ },
+ update: {
+ type: QueryTypes.SQL,
+ },
+ delete: {
+ type: QueryTypes.SQL,
+ },
+ },
+ }
+
+ class SnowflakeIntegration {
+ private client: Snowflake
+
+ constructor(config: SnowflakeConfig) {
+ this.client = new Snowflake(config)
+ }
+
+ async internalQuery(query: SqlQuery) {
+ await this.client.connect()
+ try {
+ return await this.client.execute(query.sql)
+ } catch (err: any) {
+ throw err?.message.split(":")[1] || err?.message
+ }
+ }
+
+ async create(query: SqlQuery) {
+ return this.internalQuery(query)
+ }
+
+ async read(query: SqlQuery) {
+ return this.internalQuery(query)
+ }
+
+ async update(query: SqlQuery) {
+ return this.internalQuery(query)
+ }
+
+ async delete(query: SqlQuery) {
+ return this.internalQuery(query)
+ }
+ }
+
+ module.exports = {
+ schema: SCHEMA,
+ integration: SnowflakeIntegration,
+ }
+}
diff --git a/packages/server/src/threads/index.ts b/packages/server/src/threads/index.ts
index c19453cf44..8516b62596 100644
--- a/packages/server/src/threads/index.ts
+++ b/packages/server/src/threads/index.ts
@@ -28,6 +28,8 @@ export class Thread {
workers: any
timeoutMs: any
+ static workerRefs: any[] = []
+
constructor(type: any, opts: any = { timeoutMs: null, count: 1 }) {
this.type = type
this.count = opts.count ? opts.count : 1
@@ -46,6 +48,7 @@ export class Thread {
workerOpts.maxCallTime = opts.timeoutMs
}
this.workers = workerFarm(workerOpts, typeToFile(type))
+ Thread.workerRefs.push(this.workers)
}
}
@@ -73,4 +76,23 @@ export class Thread {
})
})
}
+
+ static shutdown() {
+ return new Promise(resolve => {
+ if (Thread.workerRefs.length === 0) {
+ resolve()
+ }
+ let count = 0
+ function complete() {
+ count++
+ if (count >= Thread.workerRefs.length) {
+ resolve()
+ }
+ }
+ for (let worker of Thread.workerRefs) {
+ workerFarm.end(worker, complete)
+ }
+ Thread.workerRefs = []
+ })
+ }
}
diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js
index e2a76c49a1..ed1cb1923a 100644
--- a/packages/server/src/utilities/fileSystem/index.js
+++ b/packages/server/src/utilities/fileSystem/index.js
@@ -21,6 +21,7 @@ const env = require("../../environment")
const {
USER_METDATA_PREFIX,
LINK_USER_METADATA_PREFIX,
+ TABLE_ROW_PREFIX,
} = require("../../db/utils")
const MemoryStream = require("memorystream")
const { getAppId } = require("@budibase/backend-core/context")
@@ -109,6 +110,23 @@ exports.apiFileReturn = contents => {
return fs.createReadStream(path)
}
+exports.defineFilter = excludeRows => {
+ if (excludeRows) {
+ return doc =>
+ !(
+ doc._id.includes(USER_METDATA_PREFIX) ||
+ doc._id.includes(LINK_USER_METADATA_PREFIX) ||
+ doc._id.includes(TABLE_ROW_PREFIX)
+ )
+ } else if (!excludeRows) {
+ return doc =>
+ !(
+ doc._id.includes(USER_METDATA_PREFIX) ||
+ doc._id.includes(LINK_USER_METADATA_PREFIX)
+ )
+ }
+}
+
/**
* Local utility to back up the database state for an app, excluding global user
* data or user relationships.
@@ -116,14 +134,10 @@ exports.apiFileReturn = contents => {
* @param {object} config Config to send to export DB
* @returns {*} either a string or a stream of the backup
*/
-const backupAppData = async (appId, config) => {
+const backupAppData = async (appId, config, includeRows) => {
return await exports.exportDB(appId, {
...config,
- filter: doc =>
- !(
- doc._id.includes(USER_METDATA_PREFIX) ||
- doc._id.includes(LINK_USER_METADATA_PREFIX)
- ),
+ filter: exports.defineFilter(includeRows),
})
}
@@ -142,8 +156,8 @@ exports.performBackup = async (appId, backupName) => {
* @param {string} appId The ID of the app which is to be backed up.
* @returns {*} a readable stream of the backup which is written in real time
*/
-exports.streamBackup = async appId => {
- return await backupAppData(appId, { stream: true })
+exports.streamBackup = async (appId, includeRows) => {
+ return await backupAppData(appId, { stream: true }, includeRows)
}
/**
diff --git a/packages/server/src/utilities/queue/inMemoryQueue.js b/packages/server/src/utilities/queue/inMemoryQueue.js
index aebc0ba919..375092609e 100644
--- a/packages/server/src/utilities/queue/inMemoryQueue.js
+++ b/packages/server/src/utilities/queue/inMemoryQueue.js
@@ -75,6 +75,13 @@ class InMemoryQueue {
this._emitter.emit("message")
}
+ /**
+ * replicating the close function from bull, which waits for jobs to finish.
+ */
+ async close() {
+ return []
+ }
+
/**
* This removes a cron which has been implemented, this is part of Bull API.
* @param {string} cronJobId The cron which is to be removed.
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index da08d0ae6f..d51f6ab570 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -88,7 +88,7 @@
dependencies:
tslib "^2.2.0"
-"@azure/core-auth@^1.1.4":
+"@azure/core-auth@^1.1.4", "@azure/core-auth@^1.3.0":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.3.2.tgz#6a2c248576c26df365f6c7881ca04b7f6d08e3d0"
integrity sha512-7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==
@@ -96,6 +96,58 @@
"@azure/abort-controller" "^1.0.0"
tslib "^2.2.0"
+"@azure/core-http@^2.0.0":
+ version "2.2.5"
+ resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-2.2.5.tgz#e8cf8345d4a7f0ee7c8304a300c43d2df992ddbe"
+ integrity sha512-kctMqSQ6zfnlFpuYzfUKadeTyOQYbIQ+3Rj7dzVC3Dk1dOnHroTwR9hLYKX8/n85iJpkyaksaXpuh5L7GJRYuQ==
+ dependencies:
+ "@azure/abort-controller" "^1.0.0"
+ "@azure/core-auth" "^1.3.0"
+ "@azure/core-tracing" "1.0.0-preview.13"
+ "@azure/logger" "^1.0.0"
+ "@types/node-fetch" "^2.5.0"
+ "@types/tunnel" "^0.0.3"
+ form-data "^4.0.0"
+ node-fetch "^2.6.7"
+ process "^0.11.10"
+ tough-cookie "^4.0.0"
+ tslib "^2.2.0"
+ tunnel "^0.0.6"
+ uuid "^8.3.0"
+ xml2js "^0.4.19"
+
+"@azure/core-lro@^2.2.0":
+ version "2.2.4"
+ resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.2.4.tgz#42fbf4ae98093c59005206a4437ddcd057c57ca1"
+ integrity sha512-e1I2v2CZM0mQo8+RSix0x091Av493e4bnT22ds2fcQGslTHzM2oTbswkB65nP4iEpCxBrFxOSDPKExmTmjCVtQ==
+ dependencies:
+ "@azure/abort-controller" "^1.0.0"
+ "@azure/core-tracing" "1.0.0-preview.13"
+ "@azure/logger" "^1.0.0"
+ tslib "^2.2.0"
+
+"@azure/core-paging@^1.1.1":
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.3.0.tgz#ebf6520a931be7d5ff1cf58bc4fe6c14d6a3080d"
+ integrity sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==
+ dependencies:
+ tslib "^2.2.0"
+
+"@azure/core-tracing@1.0.0-preview.13":
+ version "1.0.0-preview.13"
+ resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz#55883d40ae2042f6f1e12b17dd0c0d34c536d644"
+ integrity sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==
+ dependencies:
+ "@opentelemetry/api" "^1.0.1"
+ tslib "^2.2.0"
+
+"@azure/logger@^1.0.0":
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.3.tgz#6e36704aa51be7d4a1bae24731ea580836293c96"
+ integrity sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==
+ dependencies:
+ tslib "^2.2.0"
+
"@azure/ms-rest-azure-env@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz#45809f89763a480924e21d3c620cd40866771625"
@@ -125,6 +177,20 @@
"@azure/ms-rest-js" "^2.0.4"
adal-node "^0.2.2"
+"@azure/storage-blob@^12.5.0":
+ version "12.10.0"
+ resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.10.0.tgz#b92269f45a1765700a900b41ca81a474a6e36ea4"
+ integrity sha512-FBEPKGnvtQJS8V8Tg1P9obgmVD9AodrIfwtwhBpsjenClhFyugMp3HPJY0tF7rInUB/CivKBCbnQKrUnKxqxzw==
+ dependencies:
+ "@azure/abort-controller" "^1.0.0"
+ "@azure/core-http" "^2.0.0"
+ "@azure/core-lro" "^2.2.0"
+ "@azure/core-paging" "^1.1.1"
+ "@azure/core-tracing" "1.0.0-preview.13"
+ "@azure/logger" "^1.0.0"
+ events "^3.0.0"
+ tslib "^2.2.0"
+
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7":
version "7.16.7"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
@@ -1037,10 +1103,10 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
-"@budibase/backend-core@1.0.185-alpha.5":
- version "1.0.185-alpha.5"
- resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.185-alpha.5.tgz#6bca521bb2e1bedd39087539a68250850de401d8"
- integrity sha512-asmhjguIcFHgC05EMtRhh/w8nvra0E+S0VcNQMGi43juIJb3ZbV3IDrOokanYyij8fv0z6F4pxYl4BHERhZheA==
+"@budibase/backend-core@1.0.192-alpha.5":
+ version "1.0.192-alpha.5"
+ resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.192-alpha.5.tgz#403c53e001ff5027b0ba3790e675a59a778a2ea0"
+ integrity sha512-Kk22jg0YrbRuKh7mYzwMY64ZY2I+i3mad3Z6i18vJxWlmhbsuOi53flQyhomBLcYARyE1gGulw9vabknU4Gc8Q==
dependencies:
"@techpass/passport-openidconnect" "^0.3.0"
aws-sdk "^2.901.0"
@@ -1116,12 +1182,12 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
-"@budibase/pro@1.0.185-alpha.5":
- version "1.0.185-alpha.5"
- resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.185-alpha.5.tgz#844c21ee68215c8b3de00d7e199ac7c9294e613f"
- integrity sha512-SQ2ZHerG/n1oBXLU2dcM3KVWFm9cbevEE3iUtkgdkMcL1asv8P982zNdYYlHf3DMmmjV3HJHYiYTLSeojZ2p7w==
+"@budibase/pro@1.0.192-alpha.5":
+ version "1.0.192-alpha.5"
+ resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.192-alpha.5.tgz#c15cfe391e8aa54a42303d819c4f6455f28a06c2"
+ integrity sha512-7nSSwjQ0Z58petgHR3re/GViAJ81mggFniMgvuKlssLqgs340zYAQoCO2T7k36hDZTtQZ1R5uplstX0uj572oQ==
dependencies:
- "@budibase/backend-core" "1.0.185-alpha.5"
+ "@budibase/backend-core" "1.0.192-alpha.5"
node-fetch "^2.6.1"
"@budibase/standard-components@^0.9.139":
@@ -1970,6 +2036,11 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"
+"@opentelemetry/api@^1.0.1":
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.1.0.tgz#563539048255bbe1a5f4f586a4a10a1bb737f44a"
+ integrity sha512-hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ==
+
"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
@@ -2414,6 +2485,17 @@
request "^2.88.0"
webfinger "^0.4.2"
+"@techteamer/ocsp@1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@techteamer/ocsp/-/ocsp-1.0.0.tgz#7b82b02093fbe351e915bb37685ac1ac5a1233d3"
+ integrity sha512-lNAOoFHaZN+4huo30ukeqVrUmfC+avoEBYQ11QAnAw1PFhnI5oBCg8O/TNiCoEWix7gNGBIEjrQwtPREqKMPog==
+ dependencies:
+ asn1.js "^5.4.1"
+ asn1.js-rfc2560 "^5.0.1"
+ asn1.js-rfc5280 "^3.0.0"
+ async "^3.2.1"
+ simple-lru-cache "^0.0.2"
+
"@tootallnate/once@1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
@@ -2723,16 +2805,29 @@
"@types/bson" "*"
"@types/node" "*"
-"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.13.4", "@types/node@>=13.7.0":
- version "17.0.35"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.35.tgz#635b7586086d51fb40de0a2ec9d1014a5283ba4a"
- integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==
+"@types/node-fetch@^2.5.0":
+ version "2.6.1"
+ resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
+ integrity sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA==
+ dependencies:
+ "@types/node" "*"
+ form-data "^3.0.0"
+
+"@types/node@*", "@types/node@>=13.13.4":
+ version "17.0.18"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.18.tgz#3b4fed5cfb58010e3a2be4b6e74615e4847f1074"
+ integrity sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==
"@types/node@16.9.1":
version "16.9.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708"
integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==
+"@types/node@>=12.12.47", "@types/node@>=13.7.0":
+ version "17.0.35"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.35.tgz#635b7586086d51fb40de0a2ec9d1014a5283ba4a"
+ integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==
+
"@types/node@>=8.0.0 <15":
version "14.18.18"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.18.tgz#5c9503030df484ccffcbb935ea9a9e1d6fad1a20"
@@ -2834,6 +2929,13 @@
resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
+"@types/tunnel@^0.0.3":
+ version "0.0.3"
+ resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.3.tgz#f109e730b072b3136347561fc558c9358bb8c6e9"
+ integrity sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==
+ dependencies:
+ "@types/node" "*"
+
"@types/yargs-parser@*":
version "21.0.0"
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
@@ -3201,7 +3303,7 @@ adal-node@^0.2.2:
uuid "^3.1.0"
xpath.js "~1.1.0"
-agent-base@6:
+agent-base@6, agent-base@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -3489,6 +3591,30 @@ asap@^2.0.3:
resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
+asn1.js-rfc2560@^5.0.0, asn1.js-rfc2560@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/asn1.js-rfc2560/-/asn1.js-rfc2560-5.0.1.tgz#cff99b903e714756b29503ad49de01c72f131e60"
+ integrity sha512-1PrVg6kuBziDN3PGFmRk3QrjpKvP9h/Hv5yMrFZvC1kpzP6dQRzf5BpKstANqHBkaOUmTpakJWhicTATOA/SbA==
+ dependencies:
+ asn1.js-rfc5280 "^3.0.0"
+
+asn1.js-rfc5280@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/asn1.js-rfc5280/-/asn1.js-rfc5280-3.0.0.tgz#94e60498d5d4984b842d1a825485837574ccc902"
+ integrity sha512-Y2LZPOWeZ6qehv698ZgOGGCZXBQShObWnGthTrIFlIQjuV1gg2B8QOhWFRExq/MR1VnPpIIe7P9vX2vElxv+Pg==
+ dependencies:
+ asn1.js "^5.0.0"
+
+asn1.js@^5.0.0, asn1.js@^5.4.1:
+ version "5.4.1"
+ resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+ integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
+ dependencies:
+ bn.js "^4.0.0"
+ inherits "^2.0.1"
+ minimalistic-assert "^1.0.0"
+ safer-buffer "^2.1.0"
+
asn1@~0.2.3:
version "0.2.6"
resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
@@ -3533,7 +3659,7 @@ async@^2.6.3:
dependencies:
lodash "^4.17.14"
-async@^3.2.3:
+async@^3.2.1, async@^3.2.3:
version "3.2.3"
resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
@@ -3565,10 +3691,40 @@ 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==
-aws-sdk@^2.767.0, aws-sdk@^2.901.0:
- version "2.1144.0"
- resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1144.0.tgz#e0f548e45e6a3c774bc8e4e387968f638402c69b"
- integrity sha512-0QZNPezu+MJOgvRRVeE1LyNPgZD4MaomHTAbZpRgCBca9fu2C7rJCm3eX/xwfNvvqVZ0RZfEpagcFXAxk9HITg==
+aws-sdk@^2.767.0:
+ version "2.1030.0"
+ resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1030.0.tgz#24a856af3d2b8b37c14a8f59974993661c66fd82"
+ integrity sha512-to0STOb8DsSGuSsUb/WCbg/UFnMGfIYavnJH5ZlRCHzvCFjTyR+vfE8ku+qIZvfFM4+5MNTQC/Oxfun2X/TuyA==
+ 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-sdk@^2.878.0:
+ version "2.1146.0"
+ resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1146.0.tgz#1b1983447baddbe7105b2ca238a3039c82155bab"
+ integrity sha512-lg83hvrK2oiJVnklUVMXIJkeYX2nlqhvxIFlZ2wfoaJyvdGsEcOUdZ/EMDgiS0V2jwGS8CtTUypcW/t2S6gdcQ==
+ dependencies:
+ buffer "4.9.2"
+ events "1.1.1"
+ ieee754 "1.1.13"
+ jmespath "0.16.0"
+ querystring "0.2.0"
+ sax "1.2.1"
+ url "0.10.3"
+ uuid "8.0.0"
+ xml2js "0.4.19"
+
+aws-sdk@^2.901.0:
+ version "2.1121.0"
+ resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1121.0.tgz#381510f7216f1d177b01620612f60014fa48e562"
+ integrity sha512-SEbPk0cFxiqhx8s2n9ozPafWyoIH944fg8Tpy9AxqZlq/tSCphWNE0CgKATnNAKoltWdVHBTKeLwnOAK/7OX7A==
dependencies:
buffer "4.9.2"
events "1.1.1"
@@ -3619,6 +3775,14 @@ axios@^0.26.0:
dependencies:
follow-redirects "^1.14.8"
+axios@^0.27.2:
+ version "0.27.2"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
+ integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+ dependencies:
+ follow-redirects "^1.14.9"
+ form-data "^4.0.0"
+
babel-jest@^24.9.0:
version "24.9.0"
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54"
@@ -3807,11 +3971,21 @@ bcryptjs@2.4.3:
resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==
+big-integer@^1.6.43:
+ version "1.6.51"
+ resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"
+ integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==
+
big.js@^5.2.2:
version "5.2.2"
resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+bignumber.js@^2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz#838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"
+ integrity sha512-uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ==
+
bignumber.js@^9.0.0:
version "9.0.2"
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.2.tgz#71c6c6bed38de64e24a65ebe16cfcf23ae693673"
@@ -3822,6 +3996,11 @@ binary-extensions@^2.0.0:
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+binascii@0.0.2:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/binascii/-/binascii-0.0.2.tgz#a7f8a8801dbccf8b1756b743daa0fee9e2d9e0ee"
+ integrity sha512-rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA==
+
bindings@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -3871,6 +4050,11 @@ bmp-js@^0.1.0:
resolved "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz#e05a63f796a6c1ff25f4771ec7adadc148c07233"
integrity sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==
+bn.js@^4.0.0:
+ version "4.12.0"
+ resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+ integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+
boolean@^3.0.1:
version "3.2.0"
resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
@@ -3938,6 +4122,11 @@ browser-process-hrtime@^1.0.0:
resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
+browser-request@^0.3.3:
+ version "0.3.3"
+ resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
+ integrity sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==
+
browser-resolve@^1.11.3:
version "1.11.3"
resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
@@ -4770,7 +4959,7 @@ debug@^2.2.0, debug@^2.3.3:
dependencies:
ms "2.0.0"
-debug@^3.1.0, debug@^3.2.7:
+debug@^3.1.0, debug@^3.2.6, debug@^3.2.7:
version "3.2.7"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -5693,7 +5882,7 @@ events@1.1.1:
resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
-events@^3.2.0:
+events@^3.0.0, events@^3.2.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
@@ -5767,6 +5956,13 @@ expand-brackets@^2.1.4:
snapdragon "^0.8.1"
to-regex "^3.0.1"
+expand-tilde@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+ integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==
+ dependencies:
+ homedir-polyfill "^1.0.1"
+
expect@^24.9.0:
version "24.9.0"
resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
@@ -6120,7 +6316,7 @@ fn.name@1.x.x:
resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
-follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.8:
+follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.8, follow-redirects@^1.14.9:
version "1.15.1"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
@@ -6332,7 +6528,7 @@ generate-function@^2.3.1:
dependencies:
is-property "^1.0.2"
-generic-pool@3.8.2:
+generic-pool@3.8.2, generic-pool@^3.8.2:
version "3.8.2"
resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.8.2.tgz#aab4f280adb522fdfbdc5e5b64d718d3683f04e9"
integrity sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg==
@@ -6342,6 +6538,11 @@ gensync@^1.0.0-beta.2:
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+get-caller-file@^1.0.2:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+ integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
get-caller-file@^2.0.1, get-caller-file@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -6473,7 +6674,7 @@ glob@^5.0.15:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
+glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
version "7.2.3"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6827,6 +7028,13 @@ has@^1.0.3:
dependencies:
function-bind "^1.1.1"
+homedir-polyfill@^1.0.1:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+ integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
+ dependencies:
+ parse-passwd "^1.0.0"
+
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"
@@ -7499,7 +7707,7 @@ is-windows@^1.0.2:
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-is-wsl@^2.2.0:
+is-wsl@^2.1.1, is-wsl@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
@@ -8361,16 +8569,16 @@ jimp@0.16.1:
"@jimp/types" "^0.16.1"
regenerator-runtime "^0.13.3"
+jmespath@0.15.0, jmespath@^0.15.0:
+ version "0.15.0"
+ resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
+ integrity sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w==
+
jmespath@0.16.0:
version "0.16.0"
resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076"
integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==
-jmespath@^0.15.0:
- version "0.15.0"
- resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
- integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
-
joi@17.2.1:
version "17.2.1"
resolved "https://registry.yarnpkg.com/joi/-/joi-17.2.1.tgz#e5140fdf07e8fecf9bc977c2832d1bdb1e3f2a0a"
@@ -8709,7 +8917,7 @@ keyv@^3.0.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=
+ integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
dependencies:
is-buffer "^1.1.5"
@@ -9299,7 +9507,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.14.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.14.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, 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==
@@ -9543,7 +9751,7 @@ mime-kind@^3.0.0:
file-type "^12.1.0"
mime-types "^2.1.24"
-mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.24, mime-types@^2.1.27, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.24, mime-types@^2.1.27, mime-types@^2.1.29, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
version "2.1.35"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -9577,6 +9785,11 @@ min-document@^2.19.0:
dependencies:
dom-walk "^0.1.0"
+minimalistic-assert@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+ integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
"minimatch@2 || 3", minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.1:
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -9636,14 +9849,22 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-moment-timezone@^0.5.31:
+mock-require@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946"
+ integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==
+ dependencies:
+ get-caller-file "^1.0.2"
+ normalize-path "^2.1.1"
+
+moment-timezone@^0.5.15, moment-timezone@^0.5.31:
version "0.5.34"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c"
integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==
dependencies:
moment ">= 2.9.0"
-"moment@>= 2.9.0":
+"moment@>= 2.9.0", moment@^2.29.3:
version "2.29.3"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3"
integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==
@@ -10065,6 +10286,14 @@ only@~0.0.2:
resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
integrity sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q=
+open@^7.3.1:
+ version "7.4.2"
+ resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
+ integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
+ dependencies:
+ is-docker "^2.0.0"
+ is-wsl "^2.1.1"
+
open@^8.4.0:
version "8.4.0"
resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
@@ -10306,6 +10535,11 @@ parse-json@^5.2.0:
json-parse-even-better-errors "^2.3.0"
lines-and-columns "^1.1.6"
+parse-passwd@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+ integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
+
parse5@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -11099,6 +11333,13 @@ pupa@^2.1.1:
dependencies:
escape-goat "^2.0.0"
+python-struct@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/python-struct/-/python-struct-1.1.3.tgz#f0ff1845ec520408e94dd8492bfd770aad26cae3"
+ integrity sha512-UsI/mNvk25jRpGKYI38Nfbv84z48oiIWwG67DLVvjRhy8B/0aIK+5Ju5WOHgw/o9rnEmbAS00v4rgKFQeC332Q==
+ dependencies:
+ long "^4.0.0"
+
q@^1.1.2:
version "1.5.1"
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -11465,7 +11706,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.72.0, request@^2.74.0, request@^2.87.0, request@^2.88.0, request@^2.88.2:
version "2.88.2"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -11491,6 +11732,14 @@ request@^2.72.0, request@^2.74.0, request@^2.87.0, request@^2.88.0:
tunnel-agent "^0.6.0"
uuid "^3.3.2"
+requestretry@^7.0.1:
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-7.1.0.tgz#d16a1a57a95295211147841550603f3dc527541e"
+ integrity sha512-TqVDgp251BW4b8ddQ2ptaj/57Z3LZHLscAUT7v6qs70buqF2/IoOVjYbpjJ6HiW7j5+waqegGI8xKJ/+uzgDmw==
+ dependencies:
+ extend "^3.0.2"
+ lodash "^4.17.15"
+
require-directory@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -11907,6 +12156,11 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+simple-lru-cache@^0.0.2:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz#d59cc3a193c1a5d0320f84ee732f6e4713e511dd"
+ integrity sha1-1ZzDoZPBpdAyD4Tucy9uRxPlEd0=
+
simple-swizzle@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
@@ -11968,6 +12222,51 @@ snapdragon@^0.8.1:
source-map-resolve "^0.5.0"
use "^3.1.0"
+snowflake-promise@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/snowflake-promise/-/snowflake-promise-4.5.0.tgz#ceba611d27b3792966bc752c545760e0ce168c1c"
+ integrity sha512-IFY7Y1alCTY1WRFPIEcgCbjy7wCajwLNnJsvw2L7xdePir7y5ohh+S00PnF9zFRGbfVVlRh/VYqOYHEfERK2lg==
+ dependencies:
+ snowflake-sdk "^1.6.0"
+
+snowflake-sdk@^1.6.0:
+ version "1.6.10"
+ resolved "https://registry.yarnpkg.com/snowflake-sdk/-/snowflake-sdk-1.6.10.tgz#c6c4f267edbc50d3c1ef6fcc2651188bb8545dce"
+ integrity sha512-kguQQSGhmNqZfmN/yZNDaIaMMktTcrTYBjtyx+szJzV69b5F+5b77btpYp+bCFqao69otVM+IPUtb3sugvCVnQ==
+ dependencies:
+ "@azure/storage-blob" "^12.5.0"
+ "@techteamer/ocsp" "1.0.0"
+ agent-base "^6.0.2"
+ asn1.js-rfc2560 "^5.0.0"
+ asn1.js-rfc5280 "^3.0.0"
+ aws-sdk "^2.878.0"
+ axios "^0.27.2"
+ big-integer "^1.6.43"
+ bignumber.js "^2.4.0"
+ binascii "0.0.2"
+ browser-request "^0.3.3"
+ debug "^3.2.6"
+ expand-tilde "^2.0.2"
+ extend "^3.0.2"
+ generic-pool "^3.8.2"
+ glob "^7.1.6"
+ jsonwebtoken "^8.5.1"
+ mime-types "^2.1.29"
+ mkdirp "^1.0.3"
+ mock-require "^3.0.3"
+ moment "^2.29.3"
+ moment-timezone "^0.5.15"
+ open "^7.3.1"
+ python-struct "^1.1.3"
+ request "^2.88.2"
+ requestretry "^7.0.1"
+ simple-lru-cache "^0.0.2"
+ string-similarity "^4.0.4"
+ test-console "^2.0.0"
+ tmp "^0.2.1"
+ uuid "^3.3.2"
+ winston "^3.1.0"
+
sonic-boom@^1.0.2:
version "1.4.1"
resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-1.4.1.tgz#d35d6a74076624f12e6f917ade7b9d75e918f53e"
@@ -12236,6 +12535,11 @@ string-length@^4.0.1:
char-regex "^1.0.2"
strip-ansi "^6.0.0"
+string-similarity@^4.0.4:
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-4.0.4.tgz#42d01ab0b34660ea8a018da8f56a3309bb8b2a5b"
+ integrity sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ==
+
string-template@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/string-template/-/string-template-1.0.0.tgz#9e9f2233dc00f218718ec379a28a5673ecca8b96"
@@ -12683,6 +12987,11 @@ terser@^5.7.2:
source-map "~0.8.0-beta.0"
source-map-support "~0.5.20"
+test-console@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/test-console/-/test-console-2.0.0.tgz#a279f7e2e148815224d8446ffa5208f0077d68fb"
+ integrity sha512-ciILzfCQCny8zy1+HEw2yBLKus7LNMsAHymsp2fhvGTVh5pWE5v2EB7V+5ag3WM9aO2ULtgsXVQePWYE+fb7pA==
+
test-exclude@^5.2.3:
version "5.2.3"
resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
@@ -12805,6 +13114,13 @@ tmp@^0.0.33:
dependencies:
os-tmpdir "~1.0.2"
+tmp@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+ integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+ dependencies:
+ rimraf "^3.0.0"
+
tmpl@1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
@@ -13000,7 +13316,7 @@ tunnel-agent@^0.6.0:
dependencies:
safe-buffer "^5.0.1"
-tunnel@0.0.6:
+tunnel@0.0.6, tunnel@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
@@ -13300,6 +13616,11 @@ uuid@3.3.2:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+uuid@8.0.0:
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c"
+ integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==
+
uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.2:
version "8.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
@@ -13605,7 +13926,7 @@ winston-transport@^4.5.0:
readable-stream "^3.6.0"
triple-beam "^1.3.0"
-winston@^3.3.3:
+winston@^3.1.0, winston@^3.3.3:
version "3.7.2"
resolved "https://registry.yarnpkg.com/winston/-/winston-3.7.2.tgz#95b4eeddbec902b3db1424932ac634f887c400b1"
integrity sha512-QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng==
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 9dbc23967c..26257075ba 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
- "version": "1.0.185-alpha.5",
+ "version": "1.0.192-alpha.5",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",
diff --git a/packages/worker/Dockerfile b/packages/worker/Dockerfile
index b73efcc4a1..8d6abc6ad1 100644
--- a/packages/worker/Dockerfile
+++ b/packages/worker/Dockerfile
@@ -9,7 +9,9 @@ WORKDIR /app
# copy files and install dependencies
COPY . ./
-RUN yarn
+# handle node-gyp
+RUN apk add --no-cache --virtual .gyp python3 make g++ \
+ && yarn && apk del .gyp
RUN yarn global add pm2
EXPOSE 4001
diff --git a/packages/worker/docker_run.sh b/packages/worker/docker_run.sh
index 20694e5df0..e80f3e1658 100755
--- a/packages/worker/docker_run.sh
+++ b/packages/worker/docker_run.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
if [[ -z $CLUSTER_MODE ]]; then
yarn run:docker
else
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 39e85a91d8..41127a14dd 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
- "version": "1.0.185-alpha.5",
+ "version": "1.0.192-alpha.5",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@@ -32,9 +32,9 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
- "@budibase/backend-core": "^1.0.185-alpha.5",
- "@budibase/pro": "1.0.185-alpha.5",
- "@budibase/string-templates": "^1.0.185-alpha.5",
+ "@budibase/backend-core": "^1.0.192-alpha.5",
+ "@budibase/pro": "1.0.192-alpha.5",
+ "@budibase/string-templates": "^1.0.192-alpha.5",
"@koa/router": "^8.0.0",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "^0.3.0",
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index 11cf03d0cc..688d8c36f1 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -12,6 +12,7 @@ const {
getTenantId,
getTenantUser,
doesTenantExist,
+ doInTenant,
} = require("@budibase/backend-core/tenancy")
const { removeUserFromInfoDB } = require("@budibase/backend-core/deprovision")
const { errors } = require("@budibase/backend-core")
@@ -41,70 +42,73 @@ const parseBooleanParam = (param: any) => {
export const adminUser = async (ctx: any) => {
const { email, password, tenantId } = ctx.request.body
+ await doInTenant(tenantId, async () => {
+ // account portal sends a pre-hashed password - honour param to prevent double hashing
+ const hashPassword = parseBooleanParam(ctx.request.query.hashPassword)
+ // account portal sends no password for SSO users
+ const requirePassword = parseBooleanParam(ctx.request.query.requirePassword)
- // account portal sends a pre-hashed password - honour param to prevent double hashing
- const hashPassword = parseBooleanParam(ctx.request.query.hashPassword)
- // account portal sends no password for SSO users
- const requirePassword = parseBooleanParam(ctx.request.query.requirePassword)
-
- if (await doesTenantExist(tenantId)) {
- ctx.throw(403, "Organisation already exists.")
- }
-
- const response = await doWithGlobalDB(tenantId, async (db: any) => {
- const response = await db.allDocs(
- getGlobalUserParams(null, {
- include_docs: true,
- })
- )
- // write usage quotas for cloud
- if (!env.SELF_HOSTED) {
- // could be a scenario where it exists, make sure its clean
- try {
- const usageQuota = await db.get(StaticDatabases.GLOBAL.docs.usageQuota)
- if (usageQuota) {
- await db.remove(usageQuota._id, usageQuota._rev)
- }
- } catch (err) {
- // don't worry about errors
- }
- await db.put(quotas.generateNewQuotaUsage())
+ if (await doesTenantExist(tenantId)) {
+ ctx.throw(403, "Organisation already exists.")
}
- return response
- })
- if (response.rows.some((row: any) => row.doc.admin)) {
- ctx.throw(
- 403,
- "You cannot initialise once an global user has been created."
- )
- }
+ const response = await doWithGlobalDB(tenantId, async (db: any) => {
+ const response = await db.allDocs(
+ getGlobalUserParams(null, {
+ include_docs: true,
+ })
+ )
+ // write usage quotas for cloud
+ if (!env.SELF_HOSTED) {
+ // could be a scenario where it exists, make sure its clean
+ try {
+ const usageQuota = await db.get(
+ StaticDatabases.GLOBAL.docs.usageQuota
+ )
+ if (usageQuota) {
+ await db.remove(usageQuota._id, usageQuota._rev)
+ }
+ } catch (err) {
+ // don't worry about errors
+ }
+ await db.put(quotas.generateNewQuotaUsage())
+ }
+ return response
+ })
- const user = {
- email: email,
- password: password,
- createdAt: Date.now(),
- roles: {},
- builder: {
- global: true,
- },
- admin: {
- global: true,
- },
- tenantId,
- }
- try {
- const finalUser = await users.save(
- user,
+ if (response.rows.some((row: any) => row.doc.admin)) {
+ ctx.throw(
+ 403,
+ "You cannot initialise once an global user has been created."
+ )
+ }
+
+ const user = {
+ email: email,
+ password: password,
+ createdAt: Date.now(),
+ roles: {},
+ builder: {
+ global: true,
+ },
+ admin: {
+ global: true,
+ },
tenantId,
- hashPassword,
- requirePassword
- )
- await bustCache(CacheKeys.CHECKLIST)
- ctx.body = finalUser
- } catch (err: any) {
- ctx.throw(err.status || 400, err)
- }
+ }
+ try {
+ const finalUser = await users.save(
+ user,
+ tenantId,
+ hashPassword,
+ requirePassword
+ )
+ await bustCache(CacheKeys.CHECKLIST)
+ ctx.body = finalUser
+ } catch (err: any) {
+ ctx.throw(err.status || 400, err)
+ }
+ })
}
export const destroy = async (ctx: any) => {
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index 1cec2868c6..fb395a7e6a 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -12,6 +12,7 @@ const destroyable = require("server-destroy")
const koaBody = require("koa-body")
const koaSession = require("koa-session")
const { passport } = require("@budibase/backend-core/auth")
+const { logAlert } = require("@budibase/backend-core/logging")
const logger = require("koa-pino-logger")
const http = require("http")
const api = require("./api")
@@ -28,7 +29,6 @@ app.keys = ["secret", "key"]
// set up top level koa middleware
app.use(koaBody({ multipart: true }))
app.use(koaSession(app))
-
app.use(
logger({
prettyPrint: {
@@ -62,25 +62,38 @@ if (env.isProd()) {
const server = http.createServer(app.callback())
destroyable(server)
+let shuttingDown = false,
+ errCode = 0
server.on("close", async () => {
- if (env.isProd()) {
+ if (shuttingDown) {
+ return
+ }
+ shuttingDown = true
+ if (!env.isTest()) {
console.log("Server Closed")
}
await redis.shutdown()
+ if (!env.isTest()) {
+ process.exit(errCode)
+ }
})
+const shutdown = () => {
+ server.close()
+ server.destroy()
+}
+
module.exports = server.listen(parseInt(env.PORT || 4002), async () => {
console.log(`Worker running on ${JSON.stringify(server.address())}`)
await redis.init()
})
process.on("uncaughtException", err => {
- console.error(err)
- server.close()
- server.destroy()
+ errCode = -1
+ logAlert("Uncaught exception.", err)
+ shutdown()
})
process.on("SIGTERM", () => {
- server.close()
- server.destroy()
+ shutdown()
})
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 614ed8614d..a76f802550 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,10 +291,10 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
-"@budibase/backend-core@1.0.185-alpha.5":
- version "1.0.185-alpha.5"
- resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.185-alpha.5.tgz#6bca521bb2e1bedd39087539a68250850de401d8"
- integrity sha512-asmhjguIcFHgC05EMtRhh/w8nvra0E+S0VcNQMGi43juIJb3ZbV3IDrOokanYyij8fv0z6F4pxYl4BHERhZheA==
+"@budibase/backend-core@1.0.192-alpha.5":
+ version "1.0.192-alpha.5"
+ resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.192-alpha.5.tgz#403c53e001ff5027b0ba3790e675a59a778a2ea0"
+ integrity sha512-Kk22jg0YrbRuKh7mYzwMY64ZY2I+i3mad3Z6i18vJxWlmhbsuOi53flQyhomBLcYARyE1gGulw9vabknU4Gc8Q==
dependencies:
"@techpass/passport-openidconnect" "^0.3.0"
aws-sdk "^2.901.0"
@@ -320,12 +320,12 @@
uuid "^8.3.2"
zlib "^1.0.5"
-"@budibase/pro@1.0.185-alpha.5":
- version "1.0.185-alpha.5"
- resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.185-alpha.5.tgz#844c21ee68215c8b3de00d7e199ac7c9294e613f"
- integrity sha512-SQ2ZHerG/n1oBXLU2dcM3KVWFm9cbevEE3iUtkgdkMcL1asv8P982zNdYYlHf3DMmmjV3HJHYiYTLSeojZ2p7w==
+"@budibase/pro@1.0.192-alpha.5":
+ version "1.0.192-alpha.5"
+ resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.192-alpha.5.tgz#c15cfe391e8aa54a42303d819c4f6455f28a06c2"
+ integrity sha512-7nSSwjQ0Z58petgHR3re/GViAJ81mggFniMgvuKlssLqgs340zYAQoCO2T7k36hDZTtQZ1R5uplstX0uj572oQ==
dependencies:
- "@budibase/backend-core" "1.0.185-alpha.5"
+ "@budibase/backend-core" "1.0.192-alpha.5"
node-fetch "^2.6.1"
"@cspotcode/source-map-support@^0.8.0":
@@ -5973,11 +5973,16 @@ side-channel@^1.0.4:
get-intrinsic "^1.0.2"
object-inspect "^1.9.0"
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
+signal-exit@^3.0.0:
version "3.0.7"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+signal-exit@^3.0.2, signal-exit@^3.0.3:
+ version "3.0.6"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
+ integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
+
sisteransi@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"