Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Merge branch 'dev' into brian/um-16-clickhouse-support

Brian Cao304314fff0fe
diff --cc lib/db.js
index 93a54badb,b44b4d3ea..894c60a24
--- a/lib/db.js
+++ b/lib/db.js
@@@ -29,18 -18,8 +29,8 @@@ function logQuery(e)
console.log(chalk.yellow(e.params), '->', e.query, chalk.greenBright(`${e.duration}ms`));
}
-function getClient(options) {
+function initializePrisma(options) {
- let prisma;
-
- if (process.env.NODE_ENV === 'production') {
- prisma = new PrismaClient(options);
- } else {
- if (!global.prisma) {
- global.prisma = new PrismaClient(options);
- }
-
- prisma = global.prisma;
- }
+ const prisma = new PrismaClient(options);
if (process.env.LOG_QUERY) {
prisma.$on('query', logQuery);
@@@ -49,261 -28,10 +39,251 @@@
return prisma;
}
-const prisma = global.prisma || getClient(options);
+function initializeClickhouse() {
+ if (!process.env.ANALYTICS_URL) {
+ return null;
+ }
+
+ const url = new URL(process.env.ANALYTICS_URL);
-
+ const database = url.pathname.replace('/', '');
+
+ return new ClickHouse({
+ url: url.hostname,
+ port: Number(url.port),
+ basicAuth: url.password
+ ? {
+ username: url.username || 'default',
+ password: url.password,
+ }
+ : null,
+ format: 'json',
+ config: {
+ database,
+ },
+ });
+}
+
- const prisma = initializePrisma(options);
- const clickhouse = initializeClickhouse();
++const prisma = global.prisma || initializePrisma(options);
++const clickhouse = global.clickhouse || initializeClickhouse();
- console.log('clickhouse1: ', clickhouse);
+ if (process.env.NODE_ENV !== 'production') {
+ global.prisma = prisma;
++ global.clickhouse = clickhouse;
++}
+
+export { prisma, clickhouse };
+
+export function getDatabase() {
+ const type =
+ process.env.DATABASE_TYPE ||
+ (process.env.DATABASE_URL && process.env.DATABASE_URL.split(':')[0]);
+
+ if (type === 'postgres') {
+ return POSTGRESQL;
+ }
+
+ return type;
+}
+
+export function getAnalyticsDatabase() {
+ const type =
+ process.env.ANALYTICS_TYPE ||
+ (process.env.ANALYTICS_URL && process.env.ANALYTICS_URL.split(':')[0]);
+
+ if (type === 'postgres') {
+ return POSTGRESQL;
+ }
+
+ if (!type) {
+ return getDatabase();
+ }
+
+ return type;
+}
+
- export function getDateStringQuery(data, unit) {
- const db = getDatabase();
-
- if (db === POSTGRESQL) {
- return `to_char(${data}, '${POSTGRESQL_DATE_FORMATS[unit]}')`;
- }
-
- if (db === MYSQL) {
- return `DATE_FORMAT(${data}, '${MYSQL_DATE_FORMATS[unit]}')`;
- }
- }
-
+export function getDateStringQueryClickhouse(data, unit) {
+ return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}')`;
+}
+
+export function getDateQuery(field, unit, timezone) {
+ const db = getDatabase();
+
+ if (db === POSTGRESQL) {
+ if (timezone) {
- return `date_trunc('${unit}', ${field} at time zone '${timezone}')`;
++ return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
+ }
- return `date_trunc('${unit}', ${field})`;
++ return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
+ }
+
+ if (db === MYSQL) {
+ if (timezone) {
+ const tz = moment.tz(timezone).format('Z');
+
- return `convert_tz(${field},'+00:00','${tz}')`;
++ return `date_format(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;
+ }
+
- return `${field}`;
++ return `date_format(${field}, '${MYSQL_DATE_FORMATS[unit]}')`;
+ }
+}
+
+export function getDateQueryClickhouse(field, unit, timezone) {
+ if (timezone) {
+ return `date_trunc('${unit}', ${field},'${timezone}')`;
+ }
+ return `date_trunc('${unit}', ${field})`;
+}
+
+export function getDateFormatClickhouse(date) {
+ return `parseDateTimeBestEffort('${date.toUTCString()}')`;
+}
+
+export function getBetweenDatesClickhouse(field, start_at, end_at) {
+ return `${field} between ${getDateFormatClickhouse(start_at)}
+ and ${getDateFormatClickhouse(end_at)}`;
+}
+
+export function getTimestampInterval(maxColumn, minColumn) {
+ const db = getDatabase();
+
+ if (db === POSTGRESQL) {
+ return `floor(extract(epoch from max(${maxColumn}) - min(${minColumn})))`;
+ }
+
+ if (db === MYSQL) {
+ return `floor(unix_timestamp(max(${maxColumn})) - unix_timestamp(min(${minColumn})))`;
+ }
+}
+
- export function getFilterQuery(table, filters = {}, params = []) {
++export function getFilterQuery(table, column, filters = {}, params = []) {
+ const query = Object.keys(filters).reduce((arr, key) => {
+ const value = filters[key];
+
+ if (value === undefined) {
+ return arr;
+ }
+
+ switch (key) {
+ case 'url':
+ if (table === 'pageview' || table === 'event') {
+ arr.push(`and ${table}.${key}=$${params.length + 1}`);
+ params.push(decodeURIComponent(value));
+ console.log(params);
+ }
+ break;
+
+ case 'os':
+ case 'browser':
+ case 'device':
+ case 'country':
+ if (table === 'session') {
+ arr.push(`and ${table}.${key}=$${params.length + 1}`);
+ params.push(decodeURIComponent(value));
+ }
+ break;
+
+ case 'event_type':
+ if (table === 'event') {
+ arr.push(`and ${table}.${key}=$${params.length + 1}`);
+ params.push(decodeURIComponent(value));
+ }
+ break;
+
+ case 'referrer':
+ if (table === 'pageview') {
+ arr.push(`and ${table}.referrer like $${params.length + 1}`);
+ params.push(`%${decodeURIComponent(value)}%`);
+ }
+ break;
+
+ case 'domain':
+ if (table === 'pageview') {
+ arr.push(`and ${table}.referrer not like $${params.length + 1}`);
+ arr.push(`and ${table}.referrer not like '/%'`);
+ params.push(`%://${value}/%`);
+ }
+ break;
+ }
+
+ return arr;
+ }, []);
+
+ return query.join('\n');
+}
+
- export function parseFilters(table, filters = {}, params = [], sessionKey = 'session_id') {
++export function parseFilters(table, column, filters = {}, params = [], sessionKey = 'session_id') {
+ const { domain, url, event_url, referrer, os, browser, device, country, event_type } = filters;
+
+ const pageviewFilters = { domain, url, referrer };
+ const sessionFilters = { os, browser, device, country };
+ const eventFilters = { url: event_url, event_type };
+
+ return {
+ pageviewFilters,
+ sessionFilters,
+ eventFilters,
+ event: { event_type },
+ joinSession:
+ os || browser || device || country
+ ? `inner join session on ${table}.${sessionKey} = session.${sessionKey}`
+ : '',
- pageviewQuery: getFilterQuery('pageview', pageviewFilters, params),
- sessionQuery: getFilterQuery('session', sessionFilters, params),
- eventQuery: getFilterQuery('event', eventFilters, params),
++ pageviewQuery: getFilterQuery('pageview', column, pageviewFilters, params),
++ sessionQuery: getFilterQuery('session', column, sessionFilters, params),
++ eventQuery: getFilterQuery('event', column, eventFilters, params),
+ };
+}
+
+export function replaceQueryClickhouse(string, params = []) {
+ let formattedString = string;
+
+ params.forEach((a, i) => {
+ let replace = a;
+
+ if (typeof a === 'string' || a instanceof String) {
+ replace = `'${replace}'`;
+ }
+
+ formattedString = formattedString.replace(`$${i + 1}`, replace);
+ });
+
+ return formattedString;
+}
+
+export async function runQuery(query) {
+ return query.catch(e => {
+ throw e;
+ });
+}
+
+export async function rawQuery(query, params = []) {
+ const db = getDatabase();
+
+ if (db !== POSTGRESQL && db !== MYSQL) {
+ return Promise.reject(new Error('Unknown database.'));
+ }
+
+ const sql = db === MYSQL ? query.replace(/\$[0-9]+/g, '?') : query;
+
+ return runQuery(prisma.$queryRawUnsafe.apply(prisma, [sql, ...params]));
}
-export default prisma;
+export async function rawQueryClickhouse(query, params = [], debug = false) {
+ let formattedQuery = replaceQueryClickhouse(query, params);
+
+ if (debug || process.env.LOG_QUERY) {
+ console.log(formattedQuery);
+ }
+
+ return clickhouse.query(formattedQuery).toPromise();
+}
+
+export async function runAnalyticsQuery(queries) {
+ const db = getAnalyticsDatabase();
+
+ if (db === POSTGRESQL || db === MYSQL) {
+ return queries[`${RELATIONAL}`]();
+ }
+
+ if (db === CLICKHOUSE) {
+ return queries[`${CLICKHOUSE}`]();
+ }
+}
diff --cc queries/analytics/event/getEventMetrics.js
index 59e55dcf9,b0ec87b46..ff3fcf017
--- a/queries/analytics/event/getEventMetrics.js
+++ b/queries/analytics/event/getEventMetrics.js
@@@ -1,23 -1,6 +1,22 @@@
-import { getDateQuery, getFilterQuery, rawQuery } from 'lib/queries';
+import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
+import {
- rawQueryClickhouse,
+ getBetweenDatesClickhouse,
+ getDateQuery,
+ getDateQueryClickhouse,
- getDateStringQuery,
+ getFilterQuery,
+ rawQuery,
++ rawQueryClickhouse,
+ runAnalyticsQuery,
+} from 'lib/db';
-export function getEventMetrics(
+export async function getEventMetrics(...args) {
+ return runAnalyticsQuery({
+ [`${RELATIONAL}`]: () => relationalQuery(...args),
+ [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),
+ });
+}
+
+async function relationalQuery(
website_id,
start_at,
end_at,
diff --cc queries/analytics/pageview/getPageviewMetrics.js
index 3b16d7038,a72330116..e74473758
--- a/queries/analytics/pageview/getPageviewMetrics.js
+++ b/queries/analytics/pageview/getPageviewMetrics.js
@@@ -1,20 -1,6 +1,20 @@@
-import { parseFilters, rawQuery } from 'lib/queries';
+import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
+import {
+ rawQueryClickhouse,
+ runAnalyticsQuery,
+ parseFilters,
+ rawQuery,
+ getBetweenDatesClickhouse,
+} from 'lib/db';
-export function getPageviewMetrics(website_id, start_at, end_at, column, table, filters = {}) {
+export async function getPageviewMetrics(...args) {
+ return runAnalyticsQuery({
+ [`${RELATIONAL}`]: () => relationalQuery(...args),
+ [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),
+ });
+}
+
- async function relationalQuery(website_id, start_at, end_at, field, table, filters = {}) {
++async function relationalQuery(website_id, start_at, end_at, column, table, filters = {}) {
const params = [website_id, start_at, end_at];
const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
table,
@@@ -28,33 -15,7 +29,34 @@@
from ${table}
${joinSession}
where ${table}.website_id=$1
-- and ${table}.created_at between $2 and $3
- ${pageviewQuery}
- ${joinSession && sessionQuery}
- ${eventQuery}
++ and ${table}.created_at between $2 and $3
++ ${pageviewQuery}
++ ${joinSession && sessionQuery}
++ ${eventQuery}
+ group by 1
+ order by 2 desc
+ `,
+ params,
+ );
+}
+
- async function clickhouseQuery(website_id, start_at, end_at, field, table, filters = {}) {
++async function clickhouseQuery(website_id, start_at, end_at, column, table, filters = {}) {
+ const params = [website_id];
+ const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
+ table,
++ column,
+ filters,
+ params,
+ 'session_uuid',
+ );
+
+ return rawQueryClickhouse(
+ `
- select ${field} x, count(*) y
++ select ${column} x, count(*) y
+ from ${table}
+ ${joinSession}
+ where ${table}.website_id= $1
+ and ${getBetweenDatesClickhouse(table + '.created_at', start_at, end_at)}
${pageviewQuery}
${joinSession && sessionQuery}
${eventQuery}
diff --cc queries/analytics/pageview/getPageviewParams.js
index 000000000,5e51fe08f..827141b95
mode 000000,100644..100644
--- a/queries/analytics/pageview/getPageviewParams.js
+++ b/queries/analytics/pageview/getPageviewParams.js
@@@ -1,0 -1,45 +1,45 @@@
-import { getDatabase, parseFilters, rawQuery } from 'lib/queries';
++import { getDatabase, parseFilters, rawQuery } from 'lib/db';
+ import { MYSQL, POSTGRESQL } from 'lib/constants';
+
+ export function getPageviewParams(
+ param,
+ website_id,
+ start_at,
+ end_at,
+ column,
+ table,
+ filters = {},
+ ) {
+ const params = [param, website_id, start_at, end_at];
+ const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
+ table,
+ column,
+ filters,
+ params,
+ );
+
+ let splitFn;
+ let db = getDatabase();
+ if (db === MYSQL) splitFn = 'substring_index';
+ if (db === POSTGRESQL) splitFn = 'split_part';
+ if (!splitFn) return Promise.reject(new Error('Unknown database.'));
+
+ return rawQuery(
+ `select * from (
+ select
+ url, ${splitFn}(${splitFn}(url, concat($1, '='), 2), '&', 1) param
+ from
+ pageview
+ ${joinSession}
+ where
+ ${table}.website_id=$2 and ${table}.created_at between $3 and $4
+ ${pageviewQuery}
+ ${joinSession && sessionQuery}
+ ${eventQuery}
+ group by 1, 2
+ order by 2 desc
+ ) q
+ where q.param <> ''`,
+ params,
+ );
+ }
diff --cc queries/analytics/pageview/getPageviewStats.js
index 980c6a864,c4b9ef23d..1591e5d2d
--- a/queries/analytics/pageview/getPageviewStats.js
+++ b/queries/analytics/pageview/getPageviewStats.js
@@@ -1,24 -1,6 +1,23 @@@
-import { parseFilters, rawQuery, getDateQuery } from 'lib/queries';
+import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
+import {
- rawQueryClickhouse,
+ getBetweenDatesClickhouse,
+ getDateQuery,
+ getDateQueryClickhouse,
- getDateStringQuery,
+ getDateStringQueryClickhouse,
+ parseFilters,
+ rawQuery,
++ rawQueryClickhouse,
+ runAnalyticsQuery,
+} from 'lib/db';
-export function getPageviewStats(
+export async function getPageviewStats(...args) {
+ return runAnalyticsQuery({
+ [`${RELATIONAL}`]: () => relationalQuery(...args),
+ [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),
+ });
+}
+
+async function relationalQuery(
website_id,
start_at,
end_at,
@@@ -26,67 -8,31 +25,67 @@@
unit = 'day',
count = '*',
filters = {},
+ sessionKey = 'session_id',
) {
const params = [website_id, start_at, end_at];
- const { pageviewQuery, sessionQuery, joinSession } = parseFilters('pageview', filters, params);
+ const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
+ 'pageview',
+ null,
+ filters,
+ params,
+ );
return rawQuery(
+ `
- select
- ${getDateStringQuery('g.t', unit)} as t,
- g.y as y
- from
- (select ${getDateQuery('pageview.created_at', unit, timezone)} t,
++ select ${getDateQuery('pageview.created_at', unit, timezone)} t,
+ count(${count != '*' ? `${count}${sessionKey}` : count}) y
+ from pageview
+ ${joinSession}
+ where pageview.website_id=$1
- and pageview.created_at between $2 and $3
- ${pageviewQuery}
- ${sessionQuery}
- group by 1) g
- order by 1
++ and pageview.created_at between $2 and $3
++ ${pageviewQuery}
++ ${sessionQuery}
++ group by 1
+ `,
+ params,
+ );
+}
+
+async function clickhouseQuery(
+ website_id,
+ start_at,
+ end_at,
+ timezone = 'UTC',
+ unit = 'day',
+ count = '*',
+ filters = {},
+ sessionKey = 'session_uuid',
+) {
+ const params = [website_id];
+ const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
+ 'pageview',
+ filters,
+ params,
+ sessionKey,
+ );
+
+ return rawQueryClickhouse(
`
select
- g.t as t,
+ ${getDateStringQueryClickhouse('g.t', unit)} as t,
g.y as y
from
- (select ${getDateQuery('pageview.created_at', unit, timezone)} t,
- count(${count}) y
+ (select
+ ${getDateQueryClickhouse('created_at', unit, timezone)} t,
+ count(${count != '*' ? `${count}${sessionKey}` : count}) y
from pageview
${joinSession}
- where pageview.website_id=$1
- and pageview.created_at between $2 and $3
- ${pageviewQuery}
- ${sessionQuery}
- group by 1) g
- order by 1
+ where pageview.website_id= $1
- and ${getBetweenDatesClickhouse('pageview.created_at', start_at, end_at)}
- ${pageviewQuery}
- ${sessionQuery}
++ and ${getBetweenDatesClickhouse('pageview.created_at', start_at, end_at)}
++ ${pageviewQuery}
++ ${sessionQuery}
+ group by t) g
+ order by t
`,
params,
);
diff --cc queries/analytics/session/getSessionMetrics.js
index ee6d1dc0c,6ecbfecdd..5defb207b
--- a/queries/analytics/session/getSessionMetrics.js
+++ b/queries/analytics/session/getSessionMetrics.js
@@@ -1,22 -1,13 +1,27 @@@
-import { parseFilters, rawQuery } from 'lib/queries';
+import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
+import {
+ getBetweenDatesClickhouse,
+ parseFilters,
+ rawQuery,
+ rawQueryClickhouse,
+ runAnalyticsQuery,
+} from 'lib/db';
-export function getSessionMetrics(website_id, start_at, end_at, field, filters = {}) {
+export async function getSessionMetrics(...args) {
+ return runAnalyticsQuery({
+ [`${RELATIONAL}`]: () => relationalQuery(...args),
+ [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),
+ });
+}
+
+async function relationalQuery(website_id, start_at, end_at, field, filters = {}) {
const params = [website_id, start_at, end_at];
- const { pageviewQuery, sessionQuery, joinSession } = parseFilters('pageview', filters, params);
+ const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
+ 'pageview',
+ null,
+ filters,
+ params,
+ );
return rawQuery(
`
diff --cc queries/analytics/stats/getWebsiteStats.js
index 574a877db,b9c36d964..818be97c1
--- a/queries/analytics/stats/getWebsiteStats.js
+++ b/queries/analytics/stats/getWebsiteStats.js
@@@ -1,25 -1,13 +1,30 @@@
-import { parseFilters, rawQuery, getDateQuery, getTimestampInterval } from 'lib/queries';
+import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
+import {
+ getDateQuery,
+ getBetweenDatesClickhouse,
+ getDateQueryClickhouse,
+ getTimestampInterval,
+ parseFilters,
+ rawQuery,
+ rawQueryClickhouse,
+ runAnalyticsQuery,
+} from 'lib/db';
-export function getWebsiteStats(website_id, start_at, end_at, filters = {}) {
+export async function getWebsiteStats(...args) {
+ return runAnalyticsQuery({
+ [`${RELATIONAL}`]: () => relationalQuery(...args),
+ [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),
+ });
+}
+
+async function relationalQuery(website_id, start_at, end_at, filters = {}) {
const params = [website_id, start_at, end_at];
- const { pageviewQuery, sessionQuery, joinSession } = parseFilters('pageview', filters, params);
+ const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
+ 'pageview',
+ null,
+ filters,
+ params,
+ );
return rawQuery(
`
diff --cc yarn.lock
index 7d435bd7b,1668978f2..8f9857f91
--- a/yarn.lock
+++ b/yarn.lock
@@@ -2063,36 -2104,19 +2112,36 @@@ array.prototype.flatmap@^1.3.0
arrify@^1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
+asn1@~0.2.3:
+ version "0.2.6"
+ resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
+ integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
+ dependencies:
+ safer-buffer "~2.1.0"
+
[email protected], assert-plus@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+ integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
+
ast-types-flow@^0.0.7:
version "0.0.7"
- resolved "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz"
+ resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
astral-regex@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+asynckit@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+ integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
+
at-least-node@^1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"
@@@ -2110,20 -2134,10 +2159,20 @@@ autoprefixer@^10.4.4
picocolors "^1.0.0"
postcss-value-parser "^4.2.0"
+aws-sign2@~0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+ integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
+
+aws4@^1.8.0:
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+ integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+
- axe-core@^4.3.5:
- version "4.4.2"
- resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.4.2.tgz"
- integrity sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA==
+ axe-core@^4.4.2:
+ version "4.4.3"
+ resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f"
+ integrity sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w==
axobject-query@^2.2.0:
version "2.2.0"
@@@ -2184,16 -2198,9 +2233,16 @@@ balanced-match@^1.0.0
balanced-match@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
+bcrypt-pbkdf@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+ integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
+ dependencies:
+ tweetnacl "^0.14.3"
+
bcryptjs@^2.4.3:
version "2.4.3"
resolved "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"
@@@ -2398,23 -2400,9 +2447,23 @@@ [email protected], cli-truncate@^2.1.0
slice-ansi "^3.0.0"
string-width "^4.2.0"
+clickhouse@^2.5.0:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/clickhouse/-/clickhouse-2.5.0.tgz#29cece9aeb2e4f449ffb75933f32725a8f7798b3"
+ integrity sha512-3eszr5FUDnApZDCQOnpHVmNk6opTnzDNdZyG8n3MF1kf/dts47e7o2DbKC2xEG22orGMski1Flvf1J6nkUhvZA==
+ dependencies:
+ JSONStream "1.3.4"
+ lodash "4.17.21"
+ querystring "0.2.0"
+ request "2.88.0"
+ stream2asynciter "1.0.3"
+ through "2.3.8"
+ tsv "0.2.0"
+ uuid "3.4.0"
+
clone-regexp@^2.1.0:
version "2.2.0"
- resolved "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz#7d65e00885cd8796405c35a737e7a86b7429e36f"
integrity sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==
dependencies:
is-regexp "^2.0.0"
@@@ -2506,15 -2487,10 +2555,15 @@@ core-js-compat@^3.20.2, core-js-compat@
semver "7.0.0"
core-js-pure@^3.20.2:
- version "3.22.8"
- resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.22.8.tgz"
- integrity sha512-bOxbZIy9S5n4OVH63XaLVXZ49QKicjowDx/UELyJ68vxfCRpYsbyh/WNZNfEfAk+ekA8vSjt+gCDpvh672bc3w==
+ version "3.23.4"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.23.4.tgz#aba5c7fb297063444f6bf93afb0362151679a012"
+ integrity sha512-lizxkcgj3XDmi7TUBFe+bQ1vNpD5E4t76BrBWI3HdUxdw/Mq1VF4CkiHzIKyieECKtcODK2asJttoofEeUKICQ==
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+ integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
+
cors@^2.8.5:
version "2.8.5"
resolved "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"
@@@ -2719,21 -2695,14 +2768,21 @@@ d3-zoom@^2.0.0
d3-selection "2"
d3-transition "2"
- damerau-levenshtein@^1.0.7:
+ damerau-levenshtein@^1.0.8:
version "1.0.8"
- resolved "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz"
+ resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
+dashdash@^1.12.0:
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+ integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
+ dependencies:
+ assert-plus "^1.0.0"
+
data-uri-to-buffer@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b"
integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==
date-fns-tz@^1.1.4:
@@@ -3422,27 -3364,13 +3472,27 @@@ flat@^5.0.0
integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
flatted@^3.1.0:
- version "3.2.5"
- resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"
- integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
+ version "3.2.6"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2"
+ integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==
+forever-agent@~0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+ integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
+
+form-data@~2.3.2:
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+ integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.6"
+ mime-types "^2.1.12"
+
formdata-polyfill@^4.0.10:
version "4.0.10"
- resolved "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz"
+ resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==
dependencies:
fetch-blob "^3.1.2"
@@@ -3563,16 -3491,9 +3613,16 @@@ get-symbol-description@^1.0.0
call-bind "^1.0.2"
get-intrinsic "^1.1.1"
+getpass@^0.1.1:
+ version "0.1.7"
+ resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+ integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
+ dependencies:
+ assert-plus "^1.0.0"
+
glob-parent@^5.1.2:
version "5.1.2"
- resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
dependencies:
is-glob "^4.0.1"
@@@ -3656,22 -3577,9 +3706,22 @@@ graceful-fs@^4.1.2, graceful-fs@^4.1.6
resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"
integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+har-schema@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+ integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
+
+har-validator@~5.1.0:
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+ integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+ dependencies:
+ ajv "^6.12.3"
+ har-schema "^2.0.0"
+
hard-rejection@^2.1.0:
version "2.1.0"
- resolved "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
has-bigints@^1.0.1, has-bigints@^1.0.2:
@@@ -3736,18 -3644,9 +3786,18 @@@ hosted-git-info@^4.0.1
html-tags@^3.2.0:
version "3.2.0"
- resolved "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961"
integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==
+http-signature@~1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+ integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
+ dependencies:
+ assert-plus "^1.0.0"
+ jsprim "^1.2.2"
+ sshpk "^1.7.0"
+
human-signals@^2.1.0:
version "2.1.0"
resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"
@@@ -4046,14 -3945,9 +4096,14 @@@ isbot@^3.4.5
isexe@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+isstream@~0.1.2:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+ integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
+
jest-worker@^26.2.1:
version "26.6.2"
resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"
@@@ -4115,14 -4004,9 +4165,14 @@@ json-schema-traverse@^0.4.1
json-schema-traverse@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+ integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
+
json-stable-stringify-without-jsonify@^1.0.1:
version "1.0.1"
resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
@@@ -4135,14 -4019,9 +4185,14 @@@ json-stable-stringify@^1.0.1
dependencies:
jsonify "~0.0.0"
+json-stringify-safe@~5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+ integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
+
json5@^1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
dependencies:
minimist "^1.2.0"
@@@ -4168,27 -4047,12 +4218,12 @@@ jsonify@~0.0.0
resolved "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
integrity sha512-trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA==
- jsonparse@^1.2.0:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
- integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
-
- jsprim@^1.2.2:
- version "1.4.2"
- resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
- integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
- dependencies:
- assert-plus "1.0.0"
- extsprintf "1.3.0"
- json-schema "0.4.0"
- verror "1.10.0"
-
-"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.1:
- version "3.3.2"
- resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.2.tgz#afe5efe4332cd3515c065072bd4d6b0aa22152bd"
- integrity sha512-4ZCADZHRkno244xlNnn4AOG6sRQ7iBZ5BbgZ4vW4y5IZw7cVUD1PPeblm1xx/nfmMxPdt/LHsXZW8z/j58+l9Q==
+"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1:
+ version "3.3.0"
+ resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz"
+ integrity sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==
dependencies:
- array-includes "^3.1.4"
+ array-includes "^3.1.5"
object.assign "^4.1.2"
kind-of@^6.0.2, kind-of@^6.0.3:
@@@ -4334,10 -4198,10 +4369,10 @@@ lodash.pick@^4.4.0
lodash.truncate@^4.4.2:
version "4.4.2"
- resolved "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"
+ resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
-lodash@^4.17.21:
[email protected], lodash@^4.17.21:
version "4.17.21"
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@@ -4912,17 -4759,12 +4947,17 @@@ path-type@^3.0.0
path-type@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+performance-now@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+ integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
+
picocolors@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
picomatch@^2.2.2, picomatch@^2.3.1:
@@@ -5307,34 -5149,14 +5342,34 @@@ prop-types@^15.7.2, prop-types@^15.8.1
object-assign "^4.1.1"
react-is "^16.13.1"
+psl@^1.1.24:
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+ integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
+
+punycode@^1.4.1:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+ integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
+
punycode@^2.1.0:
version "2.1.1"
- resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+qs@~6.5.2:
+ version "6.5.3"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+ integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+ integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
+
queue-microtask@^1.2.2:
version "1.2.3"
- resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
+ resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
quick-lru@^4.0.1:
@@@ -5588,35 -5410,9 +5623,35 @@@ request-ip@^2.1.3
dependencies:
is_js "^0.9.0"
+ version "2.88.0"
+ resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+ integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+ dependencies:
+ aws-sign2 "~0.7.0"
+ aws4 "^1.8.0"
+ caseless "~0.12.0"
+ combined-stream "~1.0.6"
+ extend "~3.0.2"
+ forever-agent "~0.6.1"
+ form-data "~2.3.2"
+ har-validator "~5.1.0"
+ http-signature "~1.2.0"
+ is-typedarray "~1.0.0"
+ isstream "~0.1.2"
+ json-stringify-safe "~5.0.1"
+ mime-types "~2.1.19"
+ oauth-sign "~0.9.0"
+ performance-now "^2.1.0"
+ qs "~6.5.2"
+ safe-buffer "^5.1.2"
+ tough-cookie "~2.4.3"
+ tunnel-agent "^0.6.0"
+ uuid "^3.3.2"
+
require-from-string@^2.0.2:
version "2.0.2"
- resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
resolve-from@^4.0.0:
@@@ -6290,17 -6061,9 +6325,17 @@@ topojson-client@^3.1.0
dependencies:
commander "2"
+tough-cookie@~2.4.3:
+ version "2.4.3"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+ integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+ dependencies:
+ psl "^1.1.24"
+ punycode "^1.4.1"
+
trim-newlines@^3.0.0:
version "3.0.1"
- resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
tsconfig-paths@^3.14.1:
@@@ -6476,14 -6222,9 +6511,14 @@@ [email protected]
util-deprecate@^1.0.2:
version "1.0.2"
- resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
- integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+ resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+ integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
[email protected], uuid@^3.3.2:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+ integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
uuid@^7.0.3:
version "7.0.3"
resolved "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"