diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..af20abd --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +# 🎨 editorconfig.org + +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_style = space +indent_size = 2 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/.eslintignore b/.eslintignore index e69de29..a412d45 100644 --- a/.eslintignore +++ b/.eslintignore @@ -0,0 +1,5 @@ +node_modules +dist +.eslintrc.js +babel.config.js + diff --git a/.eslintrc.js b/.eslintrc.js index fdf1551..f32317a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,10 +1,9 @@ -const OFF = 0; -const WARN = 1; -const ERROR = 2; +const [OFF, WARN, ERROR] = [0, 1, 2]; module.exports = { env: { es2021: true, + node: 10, }, extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'], parser: '@typescript-eslint/parser', @@ -13,6 +12,10 @@ module.exports = { sourceType: 'module', }, plugins: ['@typescript-eslint'], - rules: {}, - include: ['src', '__tests__'], + rules: { + '@typescript-eslint/no-explicit-any': OFF, + '@typescript-eslint/explicit-module-boundary-types': OFF, + '@typescript-eslint/ban-types': OFF, + '@typescript-eslint/no-non-null-assertion': OFF, + }, }; diff --git a/.gitignore b/.gitignore index 0a572f4..1c3d942 100644 --- a/.gitignore +++ b/.gitignore @@ -105,9 +105,3 @@ dist .idea .vscode - -coverage -yarn-error.log - - -dist \ No newline at end of file diff --git a/.husky/.gitignore b/.husky/.gitignore new file mode 100644 index 0000000..31354ec --- /dev/null +++ b/.husky/.gitignore @@ -0,0 +1 @@ +_ diff --git a/.husky/commit-msg b/.husky/commit-msg new file mode 100755 index 0000000..44c73fd --- /dev/null +++ b/.husky/commit-msg @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +yarn commitlint --edit "$1" diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 0000000..d2ae35e --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +yarn lint-staged diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index fb344d3..0000000 --- a/.prettierrc +++ /dev/null @@ -1,11 +0,0 @@ -{ - "printWidth": 80, - "tabWidth": 2, - "useTabs": false, - "semi": true, - "singleQuote": true, - "trailingComma": "all", - "bracketSpacing": true, - "arrowParens": "always", - "parser": "typescript" -} diff --git a/.prettierrc.js b/.prettierrc.js new file mode 100644 index 0000000..89f7d33 --- /dev/null +++ b/.prettierrc.js @@ -0,0 +1,11 @@ +module.exports = { + printWidth: 80, + tabWidth: 2, + useTabs: false, + semi: true, + singleQuote: true, + trailingComma: 'all', + bracketSpacing: true, + arrowParens: 'always', + parser: 'typescript', +}; diff --git a/README.md b/README.md index 2adbe31..ffd2ad8 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ $ npm i axios-miniprogram ## 简介 -小程序平台专用请求库，实现了 [axios](https://github.com/axios/axios) 大部分功能，用法只存在少许差异，如果您是 [axios](https://github.com/axios/axios) 的老用户，那么不需要学习就可以直接上手使用。 +为小程序平台量身定制的轻量级请求库，请求配置以微信小程序作为标准，其他平台兼容实现。 - 支持 微信小程序、支付宝小程序、百度小程序、字节跳动小程序、QQ 小程序、uniapp。 - 支持 `Typescript`，健全的类型系统，智能的 `IDE` 提示。 @@ -32,6 +32,18 @@ $ npm i axios-miniprogram ## 使用 +### 如何引入 + +```typescript +// esm +import axios from 'axios-miniprogram'; +// cjs +const axios = require('axios-miniprogram'); +// 使用 +axios('/user'); +``` + + ### `axios(config)` 可以通过将相关配置传递给`axios`来发送请求。 @@ -314,8 +326,8 @@ axios.defaults.adapter = function adapter(adapterConfig) { // 请求数据 data, // 请求头 同 headers - header, - // 请求头 同 header + headers, + // 请求头 同 headers headers, // 响应数据格式 dataType, @@ -342,7 +354,7 @@ axios.defaults.adapter = function adapter(adapterConfig) { url, method, data, - header, + headers, success, fail, }); diff --git a/__tests__/adaptive.spec.ts b/__tests__/adaptive.spec.ts deleted file mode 100644 index 7be27d7..0000000 --- a/__tests__/adaptive.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -import adaptive from '../src/adaptive'; - -declare global { - namespace NodeJS { - interface Global { - wx: any; - } - } -} - -describe('测试 src/adaptive.ts', () => { - it('适配成功', () => { - const request = jest.fn(); - global.wx = { - request, - }; - - const adapter = adaptive(); - - expect(adapter).toBe(request); - }); - - it('适配失败', () => { - global.wx = void 0; - - expect(adaptive()).toBeUndefined(); - }); -}); diff --git a/__tests__/axios.spec.ts b/__tests__/axios.spec.ts index 526dd6e..97804a6 100644 --- a/__tests__/axios.spec.ts +++ b/__tests__/axios.spec.ts @@ -1,109 +1,3 @@ -import axios from '../src/axios'; -import CancelToken from '../src/cancel/CancelToken'; - -describe('测试 src/axios.ts', () => { - it('default', () => { - axios('/test').then(void 0, (error) => { - expect(error.isAxiosError).toBe(true); - expect(error.message).toBe('平台适配失败，您需要参阅文档使用自定义适配器手动适配当前平台'); - }); - }); - - it('axios call', async () => { - axios.defaults.adapter = (config): any => { - config.success({ status: 200, data: {}, headers: {} }); - - expect(config.method).toBe(config.url.toUpperCase().replace('/', '')); - - return 'task'; - }; - - await axios({ url: '/get' }); - await axios('/get'); - await axios.request({ url: '/get' }); - await axios.options('options'); - await axios.get('get'); - await axios.head('head'); - await axios.post('post'); - await axios.put('put'); - await axios.delete('delete'); - await axios.trace('trace'); - await axios.connect('connect'); - }); - - it('axios 携带参数', async () => { - const url = '/test'; - const params = { - id: 1, - }; - - axios.defaults.adapter = (config): any => { - config.success({ status: 200, data: {}, headers: {} }); - - expect(config.method).toBe('GET'); - expect(config.url).toBe('/test?id=1'); - - return 'task'; - }; - - await axios({ - url, - params, - }); - await axios(url, { - params, - }); - await axios.get(url, params); - }); - - it('axios 携带数据', async () => { - const url = '/test'; - const data = { - id: 1, - }; - axios.defaults.adapter = (config): any => { - config.success({ status: 200, data: '', headers: {} }); - - expect(config.method).toBe('POST'); - expect(config.url).toBe(url); - expect(config.data).toEqual(data); - - return 'task'; - }; - - await axios({ - method: 'post', - url, - data, - }); - await axios(url, { - method: 'post', - data, - }); - await axios.post(url, data); - }); - - it('axios.create 工厂方法', () => { - const instance = axios.create(); - - expect(instance.defaults).toEqual(axios.defaults); - }); - - it('取消请求', (done) => { - const source = CancelToken.source(); - const instance = axios.create(); - instance.interceptors.response.use( - (res) => { - return res; - }, - (err) => { - expect(axios.isCancel(err)).toBe(true); - done(); - } - ); - instance('/test', { - cancelToken: source.token, - }); - source.cancel('取消'); - }); +test('', () => { + expect(true).toBeTruthy(); }); diff --git a/__tests__/cancel/Cancel.spec.ts b/__tests__/cancel/Cancel.spec.ts deleted file mode 100644 index 53ad302..0000000 --- a/__tests__/cancel/Cancel.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import Cancel from '../../src/cancel/Cancel'; - -describe('测试 src/cancel/Cancel.ts', () => { - it('默认', () => { - const cancel = new Cancel(); - - expect(cancel.toString()).toBe('Cancel'); - }); - - it('自定义', () => { - const cancel = new Cancel('custom'); - - expect(cancel.toString()).toBe('Cancel: custom'); - }); -}); diff --git a/__tests__/cancel/CancelToken.spec.ts b/__tests__/cancel/CancelToken.spec.ts deleted file mode 100644 index ed3a01a..0000000 --- a/__tests__/cancel/CancelToken.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import CancelToken from '../../src/cancel/CancelToken'; - -describe('测试 src/cancel/CancelToken.ts', () => { - it('实例化', () => { - const token = new CancelToken(function (cancel) { - cancel('取消'); - }); - - // 应该抛出取消 - expect(() => token.throwIfRequested()).toThrow(); - }); - - it('工厂方法', () => { - const source = CancelToken.source(); - - // 还没有取消 返回 Undefuned - expect(source.token.throwIfRequested()).toBeUndefined(); - - source.cancel('取消'); - - // 应该抛出取消 - expect(() => source.token.throwIfRequested()).toThrow(); - - // 重复取消无效 - source.cancel('取消'); - }); -}); diff --git a/__tests__/cancel/isCancel.spec.ts b/__tests__/cancel/isCancel.spec.ts deleted file mode 100644 index f67c99e..0000000 --- a/__tests__/cancel/isCancel.spec.ts +++ /dev/null @@ -1,12 +0,0 @@ -import isCancel from '../../src/cancel/isCancel'; -import Cancel from '../../src/cancel/Cancel'; - -describe('测试 src/cancel/isCancel', () => { - it('是一个取消?', () => { - const cancel1 = {}; - const cancel2 = new Cancel(); - - expect(isCancel(cancel1)).toBe(false); - expect(isCancel(cancel2)).toBe(true); - }); -}); diff --git a/__tests__/core/Axios.spec.ts b/__tests__/core/Axios.spec.ts deleted file mode 100644 index f946462..0000000 --- a/__tests__/core/Axios.spec.ts +++ /dev/null @@ -1,63 +0,0 @@ -import Axios from '../../src/core/Axios'; - -const instance = new Axios(); - -describe('测试 src/core/Axios.ts', () => { - it('defaults', () => { - expect(instance.defaults).toEqual({}); - }); - - it('getUri', () => { - expect(instance.getUri({})).toEqual(''); - expect(instance.getUri({ url: '/test' })).toEqual('/test'); - expect(instance.getUri({ url: '', params: { id: 1 } })).toEqual('id=1'); - expect(instance.getUri({ url: '/test', params: { id: 1 } })).toEqual('/test?id=1'); - }); - - it('interceptors 成功', () => { - instance.defaults.adapter = function adapter({ data, success }): any { - expect(data).toBe('interceptors_request'); - - success({ data: 'data', headers: {} }); - - return 'task'; - }; - - instance.interceptors.request.use(function (config) { - config.data = 'interceptors_request'; - return config; - }); - - instance.interceptors.response.use(function (response) { - response.data = 'interceptors_response'; - return response; - }); - - instance - .request({ - method: 'post', - data: '', - }) - .then(({ data }) => expect(data).toBe('interceptors_response')); - }); - - it('interceptors 失败', () => { - instance.interceptors.response.use((response) => Promise.reject(response)); - - instance - .request({ - method: 'post', - data: '', - }) - .then(void 0, (error) => expect(error.data).toBe('interceptors_response')); - - instance.interceptors.request.use((config) => Promise.reject(config)); - - instance - .request({ - method: 'post', - data: '', - }) - .then(void 0, (error) => expect(error.method).toBe('post')); - }); -}); diff --git a/__tests__/core/InterceptorManager.spec.ts b/__tests__/core/InterceptorManager.spec.ts deleted file mode 100644 index 1ef48dc..0000000 --- a/__tests__/core/InterceptorManager.spec.ts +++ /dev/null @@ -1,61 +0,0 @@ -import InterceptorManager from '../../src/core/InterceptorManager'; - -describe('测试 src/core/InterceptorManager.ts', () => { - it('实例化', () => { - const interceptor = new InterceptorManager(); - const executor = jest.fn(); - - interceptor.forEach(executor); - - // executor 不应该被执行 - expect(executor.mock.calls.length).toBe(0); - }); - - it('注册和取消注册', () => { - const interceptor = new InterceptorManager(); - const executor1 = jest.fn(); - const executor2 = jest.fn(); - const id1 = interceptor.use(() => void 0); - const id2 = interceptor.use(() => void 0); - interceptor.forEach(executor1); - - // executor1 应该被执行了两次 - expect(executor1.mock.calls.length).toBe(2); - - interceptor.eject(id1); - interceptor.eject(id2); - interceptor.forEach(executor2); - - // executor2 不应该被执行 - expect(executor2.mock.calls.length).toBe(0); - }); - - it('倒序遍历', () => { - const interceptor = new InterceptorManager(); - let id = 0; - - // 应该后被执行 - interceptor.use((id) => expect(id).toBe(1)); - - // 应该先被执行 - interceptor.use((id) => expect(id).toBe(0)); - - interceptor.forEach(({ resolved }) => { - resolved(id++); - }, 'reverse'); - }); - - it('异常', () => { - const interceptor = new InterceptorManager(); - - interceptor.use( - () => void 0, - (error: any) => { - expect(error).toBe('error'); - return Promise.reject(error); - } - ); - - interceptor.forEach(({ rejected }) => rejected?.('error')); - }); -}); diff --git a/__tests__/core/dispatchRequest.spec.ts b/__tests__/core/dispatchRequest.spec.ts deleted file mode 100644 index 7cfe16f..0000000 --- a/__tests__/core/dispatchRequest.spec.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { CancelAction } from '../../src/types'; -import dispatchRequest from '../../src/core/dispatchRequest'; -import CancelToken from '../../src/cancel/CancelToken'; -import isCancel from '../../src/cancel/isCancel'; - -describe('测试 src/core/dispatchRequest.ts', () => { - it('默认', () => { - dispatchRequest({}).then(void 0, (err) => { - expect(err.message).toBe('平台适配失败，您需要参阅文档使用自定义适配器手动适配当前平台'); - }); - }); - - it('请求失败', () => { - dispatchRequest({ - adapter({ success }): any { - success({ status: 200, data: '' }); - - return 'task'; - }, - validateStatus(status) { - return status === -1; - }, - }).then(void 0, (err) => expect(err.response.status).toBe(200)); - }); - - it('自定义错误处理', () => { - dispatchRequest({ - adapter({ fail }): any { - fail({}); - - return 'task'; - }, - errorHandler(error) { - error.errorHandler = true; - return error; - }, - }).then(void 0, (error) => expect(error.errorHandler).toBe(true)); - }); - - it('取消请求', () => { - let cancel: CancelAction; - - dispatchRequest({ - adapter({ success }) { - cancel(); - setTimeout(() => { - success({ status: 200, data: '' }); - }); - }, - cancelToken: new CancelToken(function executor(c) { - cancel = c; - }), - }).then(void 0, (err) => expect(isCancel(err)).toBe(true)); - }); -}); diff --git a/__tests__/core/flattenHeaders.spec.ts b/__tests__/core/flattenHeaders.spec.ts deleted file mode 100644 index 6e8873b..0000000 --- a/__tests__/core/flattenHeaders.spec.ts +++ /dev/null @@ -1,35 +0,0 @@ -import flattenHeaders from '../../src/core/flattenHeaders'; - -describe('测试 src/core/flattenHeaders.ts', () => { - it('默认', () => { - expect(flattenHeaders({})).toEqual({}); - expect(flattenHeaders({ headers: {} })).toEqual({}); - }); - - it('默认 get', () => { - expect( - flattenHeaders({ - headers: { - common: { common: 'common' }, - get: { get: 'get' }, - post: { post: 'post' }, - rest: 'rest', - }, - }) - ).toEqual({ common: 'common', get: 'get', rest: 'rest' }); - }); - - it('拉平', () => { - expect( - flattenHeaders({ - method: 'post', - headers: { - common: { common: 'common' }, - get: { get: 'get' }, - post: { post: 'post' }, - rest: 'rest', - }, - }) - ).toEqual({ common: 'common', post: 'post', rest: 'rest' }); - }); -}); diff --git a/__tests__/core/mergeConfig.spec.ts b/__tests__/core/mergeConfig.spec.ts deleted file mode 100644 index 67071f3..0000000 --- a/__tests__/core/mergeConfig.spec.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { AxiosRequestConfig } from '../../src/types'; -import mergeConfig from '../../src/core/mergeConfig'; -import defaults from '../../src/defaults'; - -describe('测试 src/core/mergeConfig.ts', () => { - it('默认', () => { - expect(mergeConfig()).toEqual({}); - - expect(mergeConfig({ baseURL: 'https://www.xxx.com' })).toEqual({ baseURL: 'https://www.xxx.com' }); - - expect(mergeConfig(void 0, { baseURL: 'https://www.xxx.com' })).toEqual({ baseURL: 'https://www.xxx.com' }); - }); - - it('只取 config2', () => { - const config2 = { url: 'https://www.config2.com', data: { config2: 0 } }; - const config = mergeConfig(defaults, config2); - - expect(config.url).toEqual(config2.url); - expect(config.data).toEqual(config2.data); - }); - - it('优先取 config2', () => { - expect(mergeConfig(defaults, {})).toEqual(defaults); - - const config2: AxiosRequestConfig = { - baseURL: 'https://www.config2.com', - method: 'post', - timeout: 10000, - }; - - const config = mergeConfig(defaults, config2); - - expect(config.baseURL).toEqual(config2.baseURL); - expect(config.method).toEqual(config2.method); - expect(config.timeout).toEqual(config2.timeout); - }); - - it('深度合并', () => { - const config1 = { params: { config1: 0 }, headers: { Config1: '0' } }; - const config2 = { params: { config2: 0 }, headers: { Config2: '0' } }; - - expect(mergeConfig(config1, {})).toEqual(config1); - - expect(mergeConfig(config1, config2)).toEqual({ - params: { config1: 0, config2: 0 }, - headers: { Config1: '0', Config2: '0' }, - }); - - expect(mergeConfig({ params: {} }, { params: { config: 'config2' } })).toEqual({ - params: { config: 'config2' }, - }); - - expect(mergeConfig({ params: { config: 'config1' } }, {})).toEqual({ - params: { config: 'config1' }, - }); - }); -}); diff --git a/__tests__/core/request.spec.ts b/__tests__/core/request.spec.ts deleted file mode 100644 index 87ad884..0000000 --- a/__tests__/core/request.spec.ts +++ /dev/null @@ -1,36 +0,0 @@ -import request from '../../src/core/request'; -import CancelToken from '../../src/cancel/CancelToken'; -import isCancel from '../../src/cancel/isCancel'; - -describe('测试 src/core/request.ts', () => { - it('默认', () => { - request({}).then(void 0, (err) => - expect(err.message).toBe('平台适配失败，您需要参阅文档使用自定义适配器手动适配当前平台') - ); - }); - - it('请求失败', () => { - request({ - adapter({ fail }): any { - fail({}); - - return 'task'; - }, - }).then(void 0, (err) => expect(err.message).toBe('配置不正确或者网络异常')); - }); - - it('取消请求', () => { - request({ - adapter({ fail }) { - setTimeout(fail); - - return { - abort: jest.fn(), - }; - }, - cancelToken: new CancelToken(function executor(c) { - c(); - }), - }).then(void 0, (err) => expect(isCancel(err)).toBe(true)); - }); -}); diff --git a/__tests__/core/transformData.spec.ts b/__tests__/core/transformData.spec.ts deleted file mode 100644 index 9af468b..0000000 --- a/__tests__/core/transformData.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { Data } from '../../src/types'; -import transformData from '../../src/core/transformData'; - -describe('测试 src/core/transformData.ts', () => { - it('默认', () => { - expect(transformData({ a: 1 }, {})).toEqual({ a: 1 }); - }); - - it('转换', () => { - function transform(data: Data) { - return data + '1'; - } - expect(transformData('1', {}, transform)).toEqual('11'); - }); - - it('多次转换', () => { - const transforms = [ - function transform(data: Data) { - return data + '1'; - }, - function transform(data: Data) { - return data + '1'; - }, - ]; - expect(transformData('1', {}, transforms)).toEqual('111'); - }); -}); diff --git a/__tests__/core/transformMethod.spec.ts b/__tests__/core/transformMethod.spec.ts deleted file mode 100644 index 933ebec..0000000 --- a/__tests__/core/transformMethod.spec.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { methodToLowercase, methodToUppercase } from '../../src/core/transformMethod'; - -describe('测试 src/core/transformMethod.ts', () => { - it('默认', () => { - expect(methodToLowercase()).toBe('get'); - expect(methodToUppercase()).toBe('GET'); - }); - - it('传参', () => { - expect(methodToLowercase('POST')).toBe('post'); - expect(methodToUppercase('post')).toBe('POST'); - }); -}); diff --git a/__tests__/core/transformRequest.spec.ts b/__tests__/core/transformRequest.spec.ts deleted file mode 100644 index c7523f8..0000000 --- a/__tests__/core/transformRequest.spec.ts +++ /dev/null @@ -1,42 +0,0 @@ -import transformRequest from '../../src/core/transformRequest'; - -describe('测试 src/core/transformRequest.ts', () => { - it('默认', () => { - expect(transformRequest({})).toEqual({ - url: '/', - method: 'GET', - headers: void 0, - data: void 0, - dataType: void 0, - enableCache: void 0, - enableHttp2: void 0, - enableQuic: void 0, - header: void 0, - responseType: void 0, - sslVerify: void 0, - timeout: void 0, - }); - }); - - it('基本', () => { - const request = transformRequest({ - baseURL: 'https://www.xxx.com///', - method: 'get', - url: '/test', - params: { - id: 1, - }, - }); - const request2 = transformRequest({ - baseURL: 'https://www.xxx.com', - method: 'get', - url: 'https://www.yyy.com/test', - params: { - id: 1, - }, - }); - - expect(request.url).toEqual('https://www.xxx.com/test?id=1'); - expect(request2.url).toEqual('https://www.yyy.com/test?id=1'); - }); -}); diff --git a/__tests__/core/transformResponse.spec.ts b/__tests__/core/transformResponse.spec.ts deleted file mode 100644 index 13ed1b6..0000000 --- a/__tests__/core/transformResponse.spec.ts +++ /dev/null @@ -1,38 +0,0 @@ -import transformResponse from '../../src/core/transformResponse'; - -describe('测试 src/core/transformResponse.ts', () => { - it('默认', () => { - expect(transformResponse({ data: {} }, {})).toEqual({ - status: 400, - statusText: 'Bad Adapter', - data: {}, - headers: {}, - config: {}, - cookies: void 0, - profile: void 0, - }); - }); - - it('status + headers', () => { - expect(transformResponse({ status: 200, headers: { status: 'ok' }, data: {} }, {})).toEqual({ - status: 200, - statusText: 'OK', - data: {}, - headers: { status: 'ok' }, - config: {}, - cookies: void 0, - profile: void 0, - }); - }); - it('statusCode + header', () => { - expect(transformResponse({ statusCode: 204, header: { status: 'ok' }, data: {} }, {})).toEqual({ - status: 204, - statusText: '', - data: {}, - headers: { status: 'ok' }, - config: {}, - cookies: void 0, - profile: void 0, - }); - }); -}); diff --git a/__tests__/helpers/buildURL.spec.ts b/__tests__/helpers/buildURL.spec.ts deleted file mode 100644 index 8cbb271..0000000 --- a/__tests__/helpers/buildURL.spec.ts +++ /dev/null @@ -1,82 +0,0 @@ -import buildURL from '../../src/helpers/buildURL'; - -describe('测试 src/helpers/buildURL.ts', () => { - it('url', () => { - expect(buildURL('/test')).toBe('/test'); - expect(buildURL('/test?id=1')).toBe('/test?id=1'); - }); - - it('url + params', () => { - expect( - buildURL('/test', { - test: 1, - }) - ).toBe('/test?test=1'); - expect( - buildURL('/test?id=1', { - test: 1, - }) - ).toBe('/test?id=1&test=1'); - }); - - it('url + params + paramsSerializer', () => { - expect( - buildURL( - '/test', - { - test: 1, - }, - () => 'paramsSerializer=ok' - ) - ).toBe('/test?paramsSerializer=ok'); - expect( - buildURL( - '/test?id=1', - { - test: 1, - }, - () => 'paramsSerializer=ok' - ) - ).toBe('/test?id=1¶msSerializer=ok'); - }); - - it('params 是数组', () => { - expect( - buildURL('/test', { - ids: [1], - }) - ).toBe('/test?ids[]=1'); - }); - - it('params 是时间对象', () => { - const date = new Date(); - expect( - buildURL('/test', { - date, - }) - ).toBe(`/test?date=${date.toISOString()}`); - }); - - it('params 是普通对象', () => { - const obj = {}; - expect( - buildURL('/test', { - obj, - }) - ).toBe(`/test?obj=%7B%7D`); - }); - - it('删除哈希', () => { - expect(buildURL('/test#192929')).toBe('/test'); - }); - - it('容错', () => { - expect( - buildURL('/test', { - null: null, - undefined: void 0, - NaN: NaN, - }) - ).toBe('/test'); - }); -}); diff --git a/__tests__/helpers/combineURL.spec.ts b/__tests__/helpers/combineURL.spec.ts deleted file mode 100644 index 05c3114..0000000 --- a/__tests__/helpers/combineURL.spec.ts +++ /dev/null @@ -1,8 +0,0 @@ -import combineURL from '../../src/helpers/combineURL'; - -describe('测试 src/helpers/combineURL.ts', () => { - it('run', () => { - expect(combineURL('1/2', '3/4')).toBe('1/2/3/4'); - expect(combineURL('1/2////', '////3/4')).toBe('1/2/3/4'); - }); -}); diff --git a/__tests__/helpers/dynamicURL.spec.ts b/__tests__/helpers/dynamicURL.spec.ts deleted file mode 100644 index 4eb2123..0000000 --- a/__tests__/helpers/dynamicURL.spec.ts +++ /dev/null @@ -1,21 +0,0 @@ -import dynamicURL from '../../src/helpers/dynamicURL'; - -describe('测试 src/helpers/dynamicURL.ts', () => { - it('run', () => { - expect(dynamicURL('http://www.api.com/user/:id', { id: 1 })).toBe( - 'http://www.api.com/user/1', - ); - expect(dynamicURL('http://www.api.com:8080/user/:id', { id: 1 })).toBe( - 'http://www.api.com:8080/user/1', - ); - expect(dynamicURL('http://www.api.com/user/:id', { id: 1 })).toBe( - 'http://www.api.com/user/1', - ); - expect(dynamicURL('http://www.api.com/user:id/', { id: 1 })).toBe( - 'http://www.api.com/user1/', - ); - expect(dynamicURL('http://www.api.com/:id/user', { id: 1 })).toBe( - 'http://www.api.com/1/user', - ); - }); -}); diff --git a/__tests__/helpers/isAbsoluteURL.spec.ts b/__tests__/helpers/isAbsoluteURL.spec.ts deleted file mode 100644 index 3bb31fb..0000000 --- a/__tests__/helpers/isAbsoluteURL.spec.ts +++ /dev/null @@ -1,10 +0,0 @@ -import isAbsoluteURL from '../../src/helpers/isAbsoluteURL'; - -describe('测试 src/helpers/isAbsoluteURL.ts', () => { - it('run', () => { - expect(isAbsoluteURL('1/2')).toBe(false); - expect(isAbsoluteURL('/1/2')).toBe(false); - expect(isAbsoluteURL('///1/2')).toBe(true); - expect(isAbsoluteURL('http://1/2')).toBe(true); - }); -}); diff --git a/__tests__/helpers/utils.spec.ts b/__tests__/helpers/utils.spec.ts deleted file mode 100644 index e7cd1dc..0000000 --- a/__tests__/helpers/utils.spec.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { encode, isDate, isPlainObject, deepMerge, pick, omit } from '../../src/helpers/utils'; - -describe('测试 src/helpers/utils.ts', () => { - it('encode 特殊字符转换', () => { - expect(encode('@:, []$')).toBe('@:,+[]$'); - }); - - it('isDate', () => { - expect(isDate(new Date())).toBe(true); - expect(isDate('')).toBe(false); - expect(isDate(Date)).toBe(false); - }); - - it('isPlainObject', () => { - expect(isPlainObject({})).toBe(true); - expect(isPlainObject(Object.create(null))).toBe(true); - expect(isPlainObject('')).toBe(false); - expect(isPlainObject(Object)).toBe(false); - }); - - it('deepMerge', () => { - expect(deepMerge({}, {})).toEqual({}); - expect(deepMerge({ a: 0, b: '1', c: { a: 0, b: '1' } }, { a: 1, b: '1', c: { a: 1, b: '1' } })).toEqual({ - a: 1, - b: '1', - c: { a: 1, b: '1' }, - }); - }); - - it('pick', () => { - expect(pick({})).toEqual({}); - - expect(pick({ a: 0, b: 0 }, 'a')).toEqual({ a: 0 }); - }); - - it('omit', () => { - expect(omit({})).toEqual({}); - - expect(omit({ a: 0, b: 0 }, 'a')).toEqual({ b: 0 }); - }); -}); diff --git a/babel.config.js b/babel.config.js index 3fec977..92cb14e 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,26 +1,4 @@ -const runtimeVersion = require('./package.json').dependencies[ - '@babel/runtime' -].replace(/^[^0-9]*/, ''); - module.exports = { - presets: [ - [ - '@babel/preset-env', - { - targets: { - ie: '8', - }, - }, - ], - '@babel/preset-typescript', - ], - plugins: [ - [ - '@babel/transform-runtime', - { - version: runtimeVersion, - }, - ], - ], + presets: ['@babel/preset-typescript'], exclude: 'node_modules/**', }; diff --git a/commitlint.config.js b/commitlint.config.js new file mode 100644 index 0000000..a7aca1d --- /dev/null +++ b/commitlint.config.js @@ -0,0 +1,17 @@ +/** + * feat：新增功能 + * fix：bug 修复 + * docs：文档更新 + * style：不影响程序逻辑的代码修改(修改空白字符，格式缩进，补全缺失的分号等，没有改变代码逻辑) + * refactor：重构代码(既没有新增功能，也没有修复 bug) + * perf：性能, 体验优化 + * test：新增测试用例或是更新现有测试 + * build：主要目的是修改项目构建系统(例如 glup，webpack，rollup 的配置等)的提交 + * ci：主要目的是修改项目继续集成流程(例如 Travis，Jenkins，GitLab CI，Circle等)的提交 + * chore：不属于以上类型的其他类型，比如构建流程, 依赖管理 + * revert：回滚某个更早之前的提交 + */ + +module.exports = { + extends: ['@commitlint/config-conventional'], +}; diff --git a/global.d.ts b/global.d.ts new file mode 100644 index 0000000..9bb3434 --- /dev/null +++ b/global.d.ts @@ -0,0 +1,14 @@ +declare const uni: any; +declare const wx: any; +declare const my: any; +declare const swan: any; +declare const tt: any; +declare const qq: any; +declare const qh: any; +declare const ks: any; +declare const dd: any; + +declare interface AnyObject { + [key: string]: T; + [key: number]: T; +} diff --git a/package.json b/package.json index 1a38d83..c295dd9 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,16 @@ { "name": "axios-miniprogram", - "version": "1.3.0", + "version": "1.3.1", "description": "基于 Promise 的 HTTP 请求库，适用于各大小程序平台。", "main": "dist/cjs/axios-miniprogram.js", "module": "dist/esm/axios-miniprogram.js", - "types": "types/index.d.ts", + "types": "dist/@types/axios-miniprogram/index.d.ts", "files": [ - "dist", - "types" + "dist" ], "repository": { "type": "git", - "url": "git+https://github.com/zjx0905/axios-miniprogram.git" + "url": "git+https://github.com/fluffff/axios-miniprogram.git" }, "keywords": [ "axios", @@ -25,32 +24,45 @@ }, "homepage": "https://github.com/fluffff/axios-miniprogram#readme", "license": "MIT", + "engines": { + "node": ">=10.0.0" + }, "scripts": { "build": "rollup --config", - "test": "jest" + "test": "jest", + "lint": "eslint", + "format": "prettier --check --write '{src,__tests__}/**/*.{js,ts,tsx}'", + "version": "yarn test && yarn build", + "prepare": "husky install" }, "devDependencies": { "@babel/core": "^7.14.0", - "@babel/plugin-transform-runtime": "^7.13.15", - "@babel/preset-env": "^7.14.1", "@babel/preset-typescript": "^7.13.0", + "@commitlint/cli": "^12.1.4", + "@commitlint/config-conventional": "^12.1.4", "@rollup/plugin-babel": "^5.3.0", "@rollup/plugin-commonjs": "^19.0.0", "@rollup/plugin-node-resolve": "^13.0.0", - "@rollup/plugin-typescript": "^8.2.1", "@types/jest": "^26.0.23", "@typescript-eslint/eslint-plugin": "^4.22.1", "@typescript-eslint/parser": "^4.22.1", "eslint": "^7.26.0", + "husky": "^6.0.0", "jest": "^26.6.3", + "lint-staged": "10.0.0", "prettier": "2.2.1", "rimraf": "^3.0.2", "rollup": "^2.47.0", - "rollup-plugin-terser": "^7.0.2", + "rollup-plugin-typescript2": "^0.30.0", "ts-node": "^9.1.1", + "tslib": "^2.2.0", "typescript": "^4.2.4" }, - "dependencies": { - "@babel/runtime": "^7.14.0" + "lint-staged": { + "*.ts": [ + "yarn lint", + "yarn format", + "yarn test" + ] } } diff --git a/rollup.config.js b/rollup.config.js index b8cd9df..d94598c 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,44 +1,42 @@ -const path = require('path'); -const rimraf = require('rimraf'); -const { nodeResolve } = require('@rollup/plugin-node-resolve'); -const { babel } = require('@rollup/plugin-babel'); -const typescript = require('@rollup/plugin-typescript'); -const commonjs = require('@rollup/plugin-commonjs'); -const { terser } = require('rollup-plugin-terser'); -const { DEFAULT_EXTENSIONS } = require('@babel/core'); +import path from 'path'; +import rimraf from 'rimraf'; +import { nodeResolve } from '@rollup/plugin-node-resolve'; +import { babel } from '@rollup/plugin-babel'; +import typescript from 'rollup-plugin-typescript2'; +import commonjs from '@rollup/plugin-commonjs'; +import { DEFAULT_EXTENSIONS } from '@babel/core'; -const pkg = require('./package.json'); +import filterEmptyLines from './scripts/@rollup/plugin-filter-empty-lines'; +import pkg from './package.json'; const entryFilePath = path.resolve(__dirname, 'src/index.ts'); -const buildPath = path.resolve(__dirname, 'dist'); +const distPath = path.resolve(__dirname, 'dist'); const pkgName = pkg.name; -function resolveOutputFilePath(format) { - return path.resolve(buildPath, format, pkgName + '.js'); -} - const extensions = [].concat(DEFAULT_EXTENSIONS, '.ts'); - -const basePlugins = [ +const plugins = [ nodeResolve({ extensions, }), - typescript({}), + typescript({ + useTsconfigDeclarationDir: true, + }), babel({ extensions, - babelHelpers: 'runtime', + babelHelpers: 'bundled', + comments: false, }), - commonjs(), + commonjs({ + include: /node_modules/, + }), + filterEmptyLines(), ]; -function createConfig(format) { - const isUmd = format === 'umd'; - const plugins = [].concat(basePlugins); - - if (isUmd) { - plugins.push(terser()); - } +function resolveOutputFilePath(format) { + return path.resolve(distPath, format, `${pkgName}.js`); +} +function generateConfig(format) { return { input: entryFilePath, output: { @@ -46,30 +44,26 @@ function createConfig(format) { format, name: pkgName, exports: 'default', - }, - external(id) { - if (isUmd) { - return false; - } - - return /@babel\/runtime/.test(id); + indent: false, }, plugins, }; } let run; -const promise = new Promise(function (resolve, reject) { - run = function (error) { - if (error) { - reject(error); +const promise = new Promise((resolve, reject) => { + run = (err) => { + if (err) { + reject(err); + return; } - resolve([createConfig('esm'), createConfig('cjs'), createConfig('umd')]); + resolve([generateConfig('esm'), generateConfig('cjs')]); }; }); -module.exports = function () { - rimraf(buildPath, run); +export default () => { + rimraf(distPath, run); + return promise; }; diff --git a/scripts/@rollup/plugin-filter-empty-lines.js b/scripts/@rollup/plugin-filter-empty-lines.js new file mode 100644 index 0000000..df69c3a --- /dev/null +++ b/scripts/@rollup/plugin-filter-empty-lines.js @@ -0,0 +1,12 @@ +module.exports = function filterEmptyLines() { + const filterREG = /\s{2,}|\n/g; + + return { + transform(code) { + return { + code: code.replace(filterREG, ''), + map: null, + }; + }, + }; +}; diff --git a/src/adaptive.ts b/src/adaptive.ts deleted file mode 100644 index 41f1947..0000000 --- a/src/adaptive.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { Adapter, Platform } from './types'; -import { isUndefined } from './helpers/utils'; - -// uniapp -declare let uni: Platform; -// 微信小程序 -declare let wx: Platform; -// 支付宝小程序 -declare let my: Platform; -// 百度小程序 -declare let swan: Platform; -// 字节跳动小程序 -declare let tt: Platform; -// QQ 小程序 -declare let qq: Platform; - -/** - * 自适应当前平台 - */ -export default function adaptive(): Adapter | undefined { - const stack: (() => Adapter)[] = [ - () => uni.request, - () => wx.request, - () => my.request, - () => swan.request, - () => tt.request, - () => qq.request, - ]; - - let adapter: Adapter | undefined; - - while (stack.length !== 0 && isUndefined(adapter)) { - try { - adapter = (stack.shift() as () => Adapter)(); - } catch (err) {} - } - - return adapter; -} diff --git a/src/axios.ts b/src/axios.ts index 09047d5..0b2345a 100644 --- a/src/axios.ts +++ b/src/axios.ts @@ -1,62 +1,59 @@ -import { AxiosRequestConfig, Data, AxiosResponse, AxiosBaseInstance, AxiosInstance } from './types'; -import Axios from './core/Axios'; -import mergeConfig from './core/mergeConfig'; -import CancelToken from './cancel/CancelToken'; -import isCancel from './cancel/isCancel'; +import { AxiosAdapter, createAdapter, AxiosPlatform } from './core/adapter'; +import Axios, { + AxiosConstructor, + AxiosRequestConfig, + AxiosResponse, +} from './core/Axios'; +import { CancelToken, CancelTokenConstructor, isCancel } from './core/cancel'; +import { mergeConfig } from './core/mergeConfig'; +import { isString } from './utils'; import defaults from './defaults'; -/** - * 创建一个新的 Axios 实例 - * - * 返回一个 Axios 实例增强 - */ +export interface AxiosInstance extends Axios { + (config: AxiosRequestConfig): Promise>; + (url: string, config?: AxiosRequestConfig): Promise< + AxiosResponse + >; +} + +export interface AxiosStatic extends AxiosInstance { + Axios: AxiosConstructor; + CancelToken: CancelTokenConstructor; + create(defaults?: AxiosRequestConfig): AxiosInstance; + createAdapter(platform: AxiosPlatform): AxiosAdapter | undefined; + isCancel(value: any): boolean; +} + function createInstance(defaults: AxiosRequestConfig): AxiosInstance { const instance = new Axios(defaults); - /** - * 支持重载的 axios 函数 - */ - function axios( + function axios( url: AxiosRequestConfig | string, - config: AxiosRequestConfig = {} - ): Promise> { - // 调用方式一处理请求配置 - if (typeof url !== 'string') { + config?: AxiosRequestConfig, + ): Promise> { + if (isString(url)) { + config = Object.assign({}, config, { url }); + } else { config = url; } - // 调用方式二处理请求配置 - else { - config = { ...config, url }; - } return instance.request(config); } - // instance 的属性合并到 axios 函数中 Object.assign(axios, instance); - // instance 的方法合并到 axios 函数中 Object.setPrototypeOf(axios, Object.getPrototypeOf(instance)); return axios as AxiosInstance; } -/** - * Axios 实例拓展 - */ -const axios = createInstance(defaults); +const axios = createInstance(defaults) as AxiosStatic; -// 添加 create 工厂方法 -axios.create = function create(defaults: AxiosRequestConfig = {}): AxiosBaseInstance { +axios.Axios = Axios; +axios.CancelToken = CancelToken; +axios.create = function create(defaults: AxiosRequestConfig): AxiosInstance { return createInstance(mergeConfig(axios.defaults, defaults)); }; - -// 添加 Axios 类 -axios.Axios = Axios; - -// 添加 CancelToken 类 -axios.CancelToken = CancelToken; - -// 添加 检查错误是否来自取消请求 方法 +axios.createAdapter = createAdapter; axios.isCancel = isCancel; export default axios; diff --git a/src/cancel/Cancel.ts b/src/cancel/Cancel.ts deleted file mode 100644 index 25cdbfc..0000000 --- a/src/cancel/Cancel.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Cancel } from '../types'; - -export default class CancelClass implements Cancel { - /** - * @param message 取消信息 - */ - public constructor(public message?: string) {} - - public toString(): string { - const message = this.message ? `: ${this.message}` : ''; - - return `Cancel${message}`; - } -} diff --git a/src/cancel/CancelToken.ts b/src/cancel/CancelToken.ts deleted file mode 100644 index ae9bccb..0000000 --- a/src/cancel/CancelToken.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { CancelToken, CancelAction, CancelExecutor, CancelTokenSource } from '../types'; -import Cancel from './Cancel'; - -export default class CancelTokenClass implements CancelToken { - /** - * 取消请求 - */ - private _reason?: Cancel; - - public listener: Promise; - - public constructor(executor: CancelExecutor) { - let action!: CancelAction; - - this.listener = new Promise((resolve) => { - action = (message) => { - // 防止重复取消 - if (this._reason) { - return; - } - - this._reason = new Cancel(message); - - resolve(this._reason); - }; - }); - - executor(action); - } - - public throwIfRequested(): void { - if (this._reason) { - throw this._reason; - } - } - - /** - * 返回一个 CancelTokenSource - * - * CancelTokenSource.token 是一个 CancelToken 对象 - * - * CancelTokenSource.cancel 是一个 CancelAction 函数 - * - * 调用 CancelTokenSource.cancel('这里可以填写您的错误信息') - * - * 取消请求 CancelTokenSource.token - */ - public static source(): CancelTokenSource { - let cancel!: CancelAction; - - const token = new CancelTokenClass(function executor(action) { - cancel = action; - }); - - return { - token, - cancel, - }; - } -} diff --git a/src/cancel/isCancel.ts b/src/cancel/isCancel.ts deleted file mode 100644 index b9d8c96..0000000 --- a/src/cancel/isCancel.ts +++ /dev/null @@ -1,10 +0,0 @@ -import Cancel from './Cancel'; - -/** - * 是否是取消请求实例 - * - * @param value 判断的值 - */ -export default function isCancel(value: unknown): value is Cancel { - return value instanceof Cancel; -} diff --git a/src/core/Axios.ts b/src/core/Axios.ts index 805fc89..ff14cc8 100644 --- a/src/core/Axios.ts +++ b/src/core/Axios.ts @@ -1,131 +1,221 @@ -import { - Method, - Params, - Data, - Interceptors, - AxiosRequestConfig, - AxiosResponse, - Axios, -} from '../types'; -import buildURL from '../helpers/buildURL'; -import mergeConfig from './mergeConfig'; -import InterceptorManager from './InterceptorManager'; +import { buildURL } from '../utils'; +import { mergeConfig } from './mergeConfig'; +import { AdapterRequestMethod, AxiosAdapter } from './adapter'; +import { CancelToken } from './cancel'; import dispatchRequest from './dispatchRequest'; +import InterceptorManager from './InterceptorManager'; +import { AxiosTransformer } from './transformData'; -export default class AxiosClass implements Axios { - public interceptors: Interceptors = { +export type AxiosRequestMethodAlias = + | 'options' + | 'get' + | 'head' + | 'post' + | 'put' + | 'delete' + | 'trace' + | 'connect'; + +export type AxiosRequestMethod = AdapterRequestMethod | AxiosRequestMethodAlias; + +export type AxiosRequestHeaders = AnyObject; + +export type AxiosRequestParams = AnyObject; + +export type AxiosRequestData = AnyObject; + +export type AxiosResponseHeaders = AnyObject; + +export interface AxiosRequestFormData extends AxiosRequestData { + fileName: string; + filePath: string; + fileType?: 'image' | 'video' | 'audio'; + hideLoading?: boolean; +} + +export interface AxiosProgressEvent { + progress: number; + totalBytesSent: number; + totalBytesExpectedToSend: number; +} + +export interface AxiosProgressCallback { + (event: AxiosProgressEvent): void; +} + +export interface AxiosRequestConfig { + adapter?: AxiosAdapter; + baseURL?: string; + cancelToken?: CancelToken; + data?: AxiosRequestData | AxiosRequestFormData; + dataType?: 'json' | '其他'; + enableHttp2?: boolean; + enableQuic?: boolean; + enableCache?: boolean; + errorHandler?: (error: any) => Promise; + headers?: AxiosRequestHeaders; + method?: AxiosRequestMethod; + onUploadProgress?: AxiosProgressCallback; + onDownloadProgress?: AxiosProgressCallback; + params?: AxiosRequestParams; + paramsSerializer?: (params?: AxiosRequestParams) => string; + responseType?: 'text' | 'arraybuffer' | 'file'; + sslVerify?: boolean; + transformRequest?: AxiosTransformer | AxiosTransformer[]; + transformResponse?: AxiosTransformer | AxiosTransformer[]; + timeout?: number; + url?: string; + validateStatus?: (status: number) => boolean; +} + +export interface AxiosResponse { + status: number; + statusText: string; + headers: AxiosResponseHeaders; + data: TData; + cookies?: string[]; + profile?: AnyObject; +} + +export interface AxiosResponseError extends AnyObject { + status: number; + statusText: string; + headers: AxiosResponseHeaders; +} + +export interface AxiosConstructor { + new (config: AxiosRequestConfig): Axios; +} + +export default class Axios { + public defaults: AxiosRequestConfig; + + public interceptors = { request: new InterceptorManager(), response: new InterceptorManager(), }; - /** - * @param defaults 自定义默认配置 - */ - public constructor(public defaults: AxiosRequestConfig = {}) {} + public constructor(defaults: AxiosRequestConfig = {}) { + this.defaults = defaults; + } public getUri(config: AxiosRequestConfig): string { - const { url = '', params, paramsSerializer } = mergeConfig(this.defaults, config); + const { url, params, paramsSerializer } = mergeConfig( + this.defaults, + config, + ); return buildURL(url, params, paramsSerializer).replace(/^\?/, ''); } - public request(config: AxiosRequestConfig): Promise> { + public request( + config: AxiosRequestConfig, + ): Promise> { const requestConfig = mergeConfig(this.defaults, config); let promiseRequest = Promise.resolve(requestConfig); - // 执行请求拦截器 - this.interceptors.request.forEach(function executor({ resolved, rejected }) { + this.interceptors.request.forEach(({ resolved, rejected }) => { promiseRequest = promiseRequest.then(resolved, rejected); }, 'reverse'); - // 发送请求 let promiseResponse = promiseRequest.then(dispatchRequest); - // 执行响应拦截器 - this.interceptors.response.forEach(function executor({ resolved, rejected }) { + this.interceptors.response.forEach(({ resolved, rejected }) => { promiseResponse = promiseResponse.then(resolved, rejected); }); - return promiseResponse as Promise>; + return promiseResponse as Promise>; } - public options( + public options( url: string, - config?: AxiosRequestConfig - ): Promise> { - return this._requestMethodWithoutParams('options', url, void 0, config); + config?: AxiosRequestConfig, + ): Promise> { + return this._requestMethodWithoutParams( + 'options', + url, + undefined, + config, + ); } - public get( + public get( url: string, - params?: Params, - config?: AxiosRequestConfig - ): Promise> { - return this._requestMethodWithoutParams('get', url, params, config); + params?: AnyObject, + config?: AxiosRequestConfig, + ): Promise> { + return this._requestMethodWithoutParams('get', url, params, config); } - public head( + public head( url: string, - params?: Params, - config?: AxiosRequestConfig - ): Promise> { - return this._requestMethodWithoutParams('head', url, params, config); + params?: AnyObject, + config?: AxiosRequestConfig, + ): Promise> { + return this._requestMethodWithoutParams('head', url, params, config); } - public post( + public post( url: string, - data?: Data, - config?: AxiosRequestConfig - ): Promise> { - return this._requestMethodWithoutData('post', url, data, config); + data?: AnyObject, + config?: AxiosRequestConfig, + ): Promise> { + return this._requestMethodWithoutData('post', url, data, config); } - public put( + public put( url: string, - data?: Data, - config?: AxiosRequestConfig - ): Promise> { - return this._requestMethodWithoutData('put', url, data, config); + data?: AnyObject, + config?: AxiosRequestConfig, + ): Promise> { + return this._requestMethodWithoutData('put', url, data, config); } - public delete( + public delete( url: string, - params?: Params, - config?: AxiosRequestConfig - ): Promise> { - return this._requestMethodWithoutParams('delete', url, params, config); + params?: AnyObject, + config?: AxiosRequestConfig, + ): Promise> { + return this._requestMethodWithoutParams( + 'delete', + url, + params, + config, + ); } - public trace( + public trace( url: string, - config?: AxiosRequestConfig - ): Promise> { - return this._requestMethodWithoutParams('trace', url, void 0, config); + config?: AxiosRequestConfig, + ): Promise> { + return this._requestMethodWithoutParams( + 'trace', + url, + undefined, + config, + ); } - public connect( + public connect( url: string, - config?: AxiosRequestConfig - ): Promise> { - return this._requestMethodWithoutParams('connect', url, void 0, config); + config?: AxiosRequestConfig, + ): Promise> { + return this._requestMethodWithoutParams( + 'connect', + url, + undefined, + config, + ); } - /** - * 合并配置后发送 HTTP 请求 - * - * @param method 请求方法 - * @param url 请求地址 - * @param params 请求参数 - * @param config 额外配置 - */ - private _requestMethodWithoutParams( - method: Method, + private _requestMethodWithoutParams( + method: AxiosRequestMethod, url: string, - params?: Params, - config: AxiosRequestConfig = {} - ): Promise> { - return this.request({ + params?: AnyObject, + config: AxiosRequestConfig = {}, + ): Promise> { + return this.request({ ...config, method, url, @@ -133,21 +223,13 @@ export default class AxiosClass implements Axios { }); } - /** - * 合并配置后发送 HTTP 请求 - * - * @param method 请求方法 - * @param url 请求地址 - * @param data 请求数据 - * @param config 额外配置 - */ - private _requestMethodWithoutData( - method: Method, + private _requestMethodWithoutData( + method: AxiosRequestMethod, url: string, - data?: Data, - config: AxiosRequestConfig = {} - ): Promise> { - return this.request({ + data?: AnyObject, + config: AxiosRequestConfig = {}, + ): Promise> { + return this.request({ ...config, method, url, diff --git a/src/core/InterceptorManager.ts b/src/core/InterceptorManager.ts index 1f84469..1a9e3c7 100644 --- a/src/core/InterceptorManager.ts +++ b/src/core/InterceptorManager.ts @@ -1,40 +1,45 @@ -import { - InterceptorResolved, - InterceptorRejected, - Interceptor, - InterceptorExecutor, - InterceptorManager, -} from '../types'; +export interface InterceptorResolved { + (value: T): T | Promise; +} -/** - * 拦截器管理器 - */ -export default class InterceptorManagerClass implements InterceptorManager { - /** - * 生成拦截器 id - */ - private _id = 0; +export interface InterceptorRejected { + (error: any): any | Promise; +} - /** - * 拦截器集合 - */ - private _interceptors: Record> = {}; +export interface Interceptor { + resolved: InterceptorResolved; + rejected?: InterceptorRejected; +} - public use(resolved: InterceptorResolved, rejected?: InterceptorRejected): number { - this._interceptors[++this._id] = { +export interface InterceptorExecutor { + (interceptor: Interceptor): void; +} + +export default class InterceptorManager { + private id = 0; + + private interceptors: AnyObject> = {}; + + public use( + resolved: InterceptorResolved, + rejected?: InterceptorRejected, + ): number { + this.interceptors[++this.id] = { resolved, rejected, }; - return this._id; + return this.id; } public eject(id: number): void { - delete this._interceptors[id]; + delete this.interceptors[id]; } - public forEach(executor: InterceptorExecutor, reverse?: 'reverse'): void { - let interceptors: Interceptor[] = Object.values(this._interceptors); + public forEach(executor: InterceptorExecutor, reverse?: 'reverse'): void { + let interceptors: Interceptor[] = Object.keys(this.interceptors).map( + (id) => this.interceptors[id], + ); if (reverse === 'reverse') { interceptors = interceptors.reverse(); diff --git a/src/core/adapter.ts b/src/core/adapter.ts new file mode 100644 index 0000000..b12e833 --- /dev/null +++ b/src/core/adapter.ts @@ -0,0 +1,270 @@ +import { + assert, + isEmptyArray, + isPlainObject, + isPlatform, + isUndefined, + revisePlatformApiNames, + throwError, +} from '../utils'; +import { + AxiosProgressCallback, + AxiosRequestConfig, + AxiosRequestData, + AxiosRequestFormData, + AxiosRequestHeaders, + AxiosResponse, + AxiosResponseError, +} from './Axios'; + +export type AdapterRequestMethod = + | 'OPTIONS' + | 'GET' + | 'HEAD' + | 'POST' + | 'PUT' + | 'DELETE' + | 'TRACE' + | 'CONNECT'; + +export type AdapterRequestType = 'request' | 'download' | 'upload'; + +export interface AxiosAdapterRequestConfig extends AxiosRequestConfig { + type: AdapterRequestType; + method: AdapterRequestMethod; + url: string; + success(response: AxiosResponse): void; + fail(error: AxiosResponseError): void; +} + +export interface AxiosAdapterRequestOptions extends AxiosAdapterRequestConfig { + header?: AxiosRequestHeaders; + success(response: any): void; + fail(error: any): void; +} + +export interface AxiosAdapterUploadOptions extends AxiosAdapterRequestOptions { + filePath: string; + name: string; + fileName: string; + fileType: 'image' | 'video' | 'audio'; + hideLoading?: boolean; + formData?: AxiosRequestData; +} + +export interface AxiosAdapterDownloadOptions + extends AxiosAdapterRequestOptions { + filePath?: string; + fileName?: string; +} + +export interface AxiosAdapterRequest { + (config: AxiosAdapterRequestOptions): AxiosAdapterTask | void; +} + +export interface AxiosAdapterUpload { + (config: AxiosAdapterUploadOptions): AxiosAdapterTask | void; +} + +export interface AxiosAdapterDownload { + (config: AxiosAdapterDownloadOptions): AxiosAdapterTask | void; +} +export interface AxiosPlatform { + request: AxiosAdapterRequest; + upload: AxiosAdapterUpload; + download: AxiosAdapterDownload; +} + +export interface AxiosAdapterTask { + abort?(): void; + onProgressUpdate?(callback: AxiosProgressCallback): void; + offProgressUpdate?(callback: AxiosProgressCallback): void; +} + +export interface AxiosAdapter { + (config: AxiosAdapterRequestConfig): AxiosAdapterTask | void; +} + +export function createAdapter(platform: AxiosPlatform): AxiosAdapter { + assert(isPlainObject(platform), 'platform 需要是一个 Object 类型'); + assert( + isPlatform(platform), + 'platform.request 与 platform.download 和 platform.upload 需要是一个 Function 类型', + ); + + function transformCommon(common: any): void { + if (!isUndefined(common.statusCode)) { + common.status = common.statusCode; + delete common.statusCode; + } + + if (isUndefined(common.status)) { + common.status = isUndefined(common.data) ? 400 : 200; + } + + if (!isUndefined(common.header)) { + common.headers = common.header; + delete common.header; + } + + if (isUndefined(common.headers)) { + common.headers = {}; + } + + if (!isUndefined(common.errMsg)) { + common.statusText = common.errMsg; + delete common.errMsg; + } + + if (isUndefined(common.statusText)) { + common.statusText = + common.status === 200 + ? 'OK' + : common.status === 400 + ? 'Bad Adapter' + : ''; + } + } + + function generateDownloadResponseData(response: any): void { + if (!isPlainObject(response.data)) { + response.data = {}; + } + + if (!isUndefined(response.tempFilePath)) { + response.data.tempFilePath = response.tempFilePath; + delete response.tempFilePath; + } + + if (!isUndefined(response.apFilePath)) { + response.data.tempFilePath = response.apFilePath; + delete response.apFilePath; + } + + if (!isUndefined(response.filePath)) { + response.data.filePath = response.filePath; + delete response.filePath; + } + } + + function requestAdapter( + request: AxiosAdapterRequest, + config: AxiosAdapterRequestConfig, + ): AxiosAdapterTask | void { + const options = Object.assign({}, config, { + header: config.headers, + success(response: any): void { + transformCommon(response); + config.success(response); + }, + fail(error: any): void { + transformCommon(error); + config.fail(error); + }, + }); + + return request(options); + } + + function uploadAdapter( + upload: AxiosAdapterUpload, + config: AxiosAdapterRequestConfig, + ): AxiosAdapterTask | void { + const { + fileName, + filePath, + fileType, + hideLoading, + ...formData + } = config.data as AxiosRequestFormData; + const options = Object.assign({}, config, { + header: config.headers, + name: fileName, + fileName: fileName, + filePath, + fileType: fileType ?? 'image', + hideLoading, + formData, + success(response: any): void { + transformCommon(response); + config.success(response); + }, + fail(error: any): void { + transformCommon(error); + config.fail(error); + }, + }); + + return upload(options); + } + + function downloadAdapter( + download: AxiosAdapterDownload, + config: AxiosAdapterRequestConfig, + ): AxiosAdapterTask | void { + const options = Object.assign({}, config, { + header: config.headers, + filePath: config.params?.filePath, + fileName: config.params?.fileName, + success(response: any): void { + transformCommon(response); + generateDownloadResponseData(response); + config.success(response); + }, + fail(error: any): void { + transformCommon(error); + config.fail(error); + }, + }); + + return download(options); + } + + return function adapterDefault( + config: AxiosAdapterRequestConfig, + ): AxiosAdapterTask | void { + switch (config.type) { + case 'request': + return requestAdapter(platform.request, config); + case 'upload': + return uploadAdapter(platform.upload, config); + case 'download': + return downloadAdapter(platform.download, config); + default: + throwError(`无法识别的请求类型 ${config.type}`); + } + }; +} + +export function getAdapterDefault(): AxiosAdapter | undefined { + const tryGetPlatforms = [ + () => uni, + () => wx, + () => my, + () => swan, + () => tt, + () => qq, + () => qh, + () => ks, + () => dd, + ]; + + let platform; + while (!isEmptyArray(tryGetPlatforms) && !isPlatform(platform)) { + try { + const tryGetPlatform = tryGetPlatforms.shift()!; + + if (isPlainObject((platform = tryGetPlatform()))) { + platform = revisePlatformApiNames(platform); + } + } catch (err) { + // 避免出现异常导致程序被终止 + } + } + + if (!isPlatform(platform)) { + return; + } + + return createAdapter(platform); +} diff --git a/src/core/cancel.ts b/src/core/cancel.ts new file mode 100644 index 0000000..032e7ec --- /dev/null +++ b/src/core/cancel.ts @@ -0,0 +1,80 @@ +export interface CancelAction { + (message?: string): void; +} + +export interface CancelExecutor { + (cancel: CancelAction): void; +} + +export interface CancelTokenSource { + token: CancelToken; + cancel: CancelAction; +} + +export interface CancelTokenConstructor { + new (executor: CancelExecutor): CancelToken; + source(): CancelTokenSource; +} + +export class Cancel { + public message?: string; + + public constructor(message?: string) { + this.message = message; + } + + public toString(): string { + const message = this.message ? `: ${this.message}` : ''; + + return `Cancel${message}`; + } +} + +export function isCancel(value: any): value is Cancel { + return value instanceof Cancel; +} + +export class CancelToken { + private reason?: Cancel; + + public listener: Promise; + + public constructor(executor: CancelExecutor) { + let action!: CancelAction; + this.listener = new Promise((resolve) => { + action = (message) => { + if (this.reason) { + return; + } + + this.reason = new Cancel(message); + + resolve(this.reason); + }; + }); + + executor(action); + } + + public static source(): CancelTokenSource { + let cancel!: CancelAction; + const token = new CancelToken((action) => { + cancel = action; + }); + + return { + token, + cancel, + }; + } + + public throwIfRequested(): void { + if (this.reason) { + throw this.reason; + } + } +} + +export function isCancelToken(value: any): value is CancelToken { + return value instanceof CancelToken; +} diff --git a/src/core/createError.ts b/src/core/createError.ts index 6bb3ec3..d60f0f0 100644 --- a/src/core/createError.ts +++ b/src/core/createError.ts @@ -1,45 +1,38 @@ -import { AxiosRequestConfig, RequestConfig, AxiosResponse, AxiosError } from '../types'; +import { AxiosAdapterRequestConfig } from './adapter'; +import { AxiosRequestConfig, AxiosResponse, AxiosResponseError } from './Axios'; -/** - * AxiosError 继承自 Error - */ -class AxiosErrorClass extends Error implements AxiosError { +export type AxiosErrorResponse = AxiosResponse | AxiosResponseError; + +class AxiosError extends Error { public isAxiosError = true; - /** - * @param message 错误信息 - * @param config Axios 请求配置 - * @param request 通用请求配置 - * @param response Axios 响应体 - */ + public config: AxiosRequestConfig; + + public request: AxiosAdapterRequestConfig; + + public response?: AxiosErrorResponse; + public constructor( message: string, - public config: AxiosRequestConfig, - public request: RequestConfig, - public response?: AxiosResponse + config: AxiosRequestConfig, + request: AxiosAdapterRequestConfig, + response?: AxiosErrorResponse, ) { super(message); - // 修复继承系统自带类 prototype 设置失败的问题 - Object.setPrototypeOf(this, AxiosErrorClass.prototype); + this.config = config; + this.request = request; + this.response = response; + + Object.setPrototypeOf(this, AxiosError.prototype); } } -/** - * 创建 AxiosError 的工厂方法 - * - * 返回一个新的 AxiosError 对象 - * - * @param message 错误信息 - * @param config Axios 请求配置 - * @param request 通用请求配置 - * @param response Axios 响应体 - */ -export default function createError( +export function createError( message: string, config: AxiosRequestConfig, - request: RequestConfig, - response?: AxiosResponse + request: AxiosAdapterRequestConfig, + response?: AxiosErrorResponse, ): AxiosError { - return new AxiosErrorClass(message, config, request, response); + return new AxiosError(message, config, request, response); } diff --git a/src/core/dispatchRequest.ts b/src/core/dispatchRequest.ts index 0e2b8be..ca011ed 100644 --- a/src/core/dispatchRequest.ts +++ b/src/core/dispatchRequest.ts @@ -1,55 +1,56 @@ -import { AxiosRequestConfig, AxiosResponse } from '../types'; -import isCancel from '../cancel/isCancel'; -import flattenHeaders from './flattenHeaders'; -import transformData from './transformData'; -import request from './request'; +import { isPlainObject } from '../utils'; +import { isCancel } from './cancel'; +import { flattenHeaders } from './flattenHeaders'; +import { transformData } from './transformData'; +import { request } from './request'; +import { AxiosRequestConfig, AxiosResponse } from './Axios'; +import { transformURL } from './transformURL'; -/** - * 如果已经取消, 则抛出取消对象 - * - * @param config Axios 请求配置 - */ function throwIfCancellationRequested(config: AxiosRequestConfig) { if (config.cancelToken) { config.cancelToken.throwIfRequested(); } } -/** - * 发送请求 - * - * @param config Axios 请求配置 - */ -export default function dispatchRequest(config: AxiosRequestConfig): Promise { +export default function dispatchRequest( + config: AxiosRequestConfig, +): Promise { throwIfCancellationRequested(config); + config.url = transformURL(config); config.headers = flattenHeaders(config); + config.data = transformData( + config.data, + config.headers, + config.transformRequest, + ); - config.data = transformData(config.data ?? {}, config.headers, config.transformRequest); - - function onResolved(response: AxiosResponse): AxiosResponse { - throwIfCancellationRequested(config); - - response.data = transformData(response.data, response.headers, config.transformResponse); - - return response; - } - - function onRejected(reason: any): Promise { - if (!isCancel(reason)) { + return request(config).then( + (response: AxiosResponse): AxiosResponse => { throwIfCancellationRequested(config); - if (reason.response !== void 0) { - reason.response.data = transformData( - reason.response.data, - reason.response.headers, - config.transformResponse - ); + response.data = transformData( + response.data, + response.headers, + config.transformResponse, + ) as TData; + + return response; + }, + (reason: any): Promise => { + if (!isCancel(reason)) { + throwIfCancellationRequested(config); + + if (isPlainObject(reason.response)) { + reason.response.data = transformData( + reason.response.data, + reason.response.headers, + config.transformResponse, + ); + } } - } - return config.errorHandler?.(reason) ?? Promise.reject(reason); - } - - return request(config).then(onResolved, onRejected); + return config.errorHandler?.(reason) ?? Promise.reject(reason); + }, + ); } diff --git a/src/core/flattenHeaders.ts b/src/core/flattenHeaders.ts index 99f76da..05aeb19 100644 --- a/src/core/flattenHeaders.ts +++ b/src/core/flattenHeaders.ts @@ -1,35 +1,34 @@ -import { Headers, AxiosRequestConfig } from '../types'; -import { isUndefined, omit } from '../helpers/utils'; -import { methodToLowercase } from './transformMethod'; +import { isPlainObject, omit } from '../utils'; +import { + AxiosRequestConfig, + AxiosRequestMethodAlias, + AxiosRequestHeaders, +} from './Axios'; -/** - * 拉平请求头 - * - * @param config Axios 请求配置 - */ -export default function flattenHeaders(config: AxiosRequestConfig): Headers { - const { headers } = config; - - if (isUndefined(headers)) { - return {}; +export function flattenHeaders( + config: AxiosRequestConfig, +): AxiosRequestHeaders | undefined { + if (!isPlainObject(config.headers)) { + return; } - const method = methodToLowercase(config.method); + const common = 'common'; + const method = config.method?.toLowerCase() ?? 'get'; + const alias: AxiosRequestMethodAlias[] = [ + 'options', + 'get', + 'head', + 'post', + 'put', + 'delete', + 'trace', + 'connect', + ]; - return { - ...(headers.common ?? {}), - ...(headers[method] ?? {}), - ...omit( - headers, - 'common', - 'options', - 'get', - 'head', - 'post', - 'put', - 'delete', - 'trace', - 'connect' - ), - }; + return Object.assign( + {}, + config.headers[common], + config.headers[method], + omit(config.headers, common, ...alias), + ); } diff --git a/src/core/generateType.ts b/src/core/generateType.ts new file mode 100644 index 0000000..cbf1647 --- /dev/null +++ b/src/core/generateType.ts @@ -0,0 +1,44 @@ +import { isPlainObject, isString } from '../utils'; +import { AdapterRequestType } from './adapter'; +import { AxiosRequestConfig } from './Axios'; + +function isUpload(config: AxiosRequestConfig): boolean { + if ( + !isString(config.method) || + !isPlainObject(config.headers) || + !isPlainObject(config.data) + ) { + return false; + } + + const method = config.method.toLowerCase(); + const contentType = + config.headers['Content-Type'] ?? config.headers['content-type']; + + return ( + method === 'post' && + /multipart\/form-data/.test(contentType) && + isString(config.data.fileName) && + isString(config.data.filePath) + ); +} + +function isDownload(config: AxiosRequestConfig): boolean { + const method = config.method?.toLowerCase() ?? 'get'; + + return method === 'get' && config.responseType === 'file'; +} + +export function generateType(config: AxiosRequestConfig): AdapterRequestType { + let requestType: AdapterRequestType = 'request'; + + if (isUpload(config)) { + requestType = 'upload'; + } + + if (isDownload(config)) { + requestType = 'download'; + } + + return requestType; +} diff --git a/src/core/mergeConfig.ts b/src/core/mergeConfig.ts index 4ab067b..7944976 100644 --- a/src/core/mergeConfig.ts +++ b/src/core/mergeConfig.ts @@ -1,122 +1,87 @@ -import { AnyObject, AxiosRequestConfig } from '../types'; -import { isPlainObject, deepMerge } from '../helpers/utils'; +import { isPlainObject, deepMerge, isUndefined } from '../utils'; +import { AxiosRequestConfig } from './Axios'; -type OnlyFromConfig2Key = 'url' | 'data'; -type PriorityFromConfig2Key = - | 'adapter' - | 'baseURL' - | 'method' - | 'validateStatus' - | 'paramsSerializer' - | 'transformRequest' - | 'transformResponse' - | 'errorHandler' - | 'cancelToken' - | 'dataType' - | 'responseType' - | 'timeout' - | 'enableHttp2' - | 'enableQuic' - | 'enableCache' - | 'sslVerify'; -type DeepMergeConfigKey = 'params' | 'headers'; +type AxiosRequestConfigKey = keyof AxiosRequestConfig; -/** - * 只取 config2 中的配置 - * - * @param keys - * @param config - * @param config2 - */ function onlyFromConfig2( - keys: OnlyFromConfig2Key[], - config: AxiosRequestConfig, - config2: AxiosRequestConfig + keys: AxiosRequestConfigKey[], + target: AxiosRequestConfig, + config2: AxiosRequestConfig, ) { keys.forEach((key) => { - if (config2[key] !== void 0) { - config[key] = config2[key] as any; + const value = config2[key]; + + if (!isUndefined(value)) { + target[key] = value as any; } }); } -/** - * 优先取 config2 中的配置, config2 中没有就取 config1 - * - * @param keys - * @param config - * @param config1 - * @param config2 - */ function priorityFromConfig2( - keys: PriorityFromConfig2Key[], - config: AxiosRequestConfig, + keys: AxiosRequestConfigKey[], + target: AxiosRequestConfig, config1: AxiosRequestConfig, - config2: AxiosRequestConfig + config2: AxiosRequestConfig, ) { keys.forEach((key) => { - if (config2[key] !== void 0) { - config[key] = config2[key] as any; - } else if (config1[key] !== void 0) { - config[key] = config1[key] as any; + const value1 = config1[key]; + const value2 = config2[key]; + + if (!isUndefined(value2)) { + target[key] = value2 as any; + } else if (!isUndefined(value1)) { + target[key] = value1 as any; } }); } -/** - * 深度合并配置 - * - * @param keys - * @param config - * @param config1 - * @param config2 - */ function deepMergeConfig( - keys: DeepMergeConfigKey[], - config: AxiosRequestConfig, + keys: AxiosRequestConfigKey[], + target: AxiosRequestConfig, config1: AxiosRequestConfig, - config2: AxiosRequestConfig + config2: AxiosRequestConfig, ) { keys.forEach((key) => { - if (isPlainObject(config2[key])) { - config[key] = deepMerge(config1[key] ?? {}, config2[key] as AnyObject); - } else if (isPlainObject(config1[key])) { - config[key] = deepMerge(config1[key] as AnyObject); + const value1 = config1[key]; + const value2 = config2[key]; + + if (isPlainObject(value2)) { + target[key] = deepMerge(value1 ?? {}, value2) as any; + } else if (isPlainObject(value1)) { + target[key] = deepMerge(value1) as any; } }); } -/** - * 合并 Axios 请求配置 - * - * @param config1 Axios 请求配置1 - * @param config2 Axios 请求配置2 - */ -export default function mergeConfig( +const onlyFromConfig2Keys: AxiosRequestConfigKey[] = ['url', 'method', 'data']; +const priorityFromConfig2Keys: AxiosRequestConfigKey[] = [ + 'adapter', + 'baseURL', + 'method', + 'validateStatus', + 'paramsSerializer', + 'transformRequest', + 'transformResponse', + 'errorHandler', + 'cancelToken', + 'dataType', + 'responseType', + 'timeout', + 'enableHttp2', + 'enableQuic', + 'enableCache', + 'sslVerify', + 'validateStatus', + 'onUploadProgress', + 'onDownloadProgress', +]; +const deepMergeConfigKeys: AxiosRequestConfigKey[] = ['headers', 'params']; + +export function mergeConfig( config1: AxiosRequestConfig = {}, - config2: AxiosRequestConfig = {} + config2: AxiosRequestConfig = {}, ): AxiosRequestConfig { const config: AxiosRequestConfig = {}; - const onlyFromConfig2Keys: OnlyFromConfig2Key[] = ['url', 'data']; - const priorityFromConfig2Keys: PriorityFromConfig2Key[] = [ - 'adapter', - 'baseURL', - 'method', - 'validateStatus', - 'paramsSerializer', - 'transformRequest', - 'transformResponse', - 'errorHandler', - 'cancelToken', - 'dataType', - 'responseType', - 'timeout', - 'enableHttp2', - 'enableQuic', - 'enableCache', - 'sslVerify', - ]; - const deepMergeConfigKeys: DeepMergeConfigKey[] = ['headers', 'params']; onlyFromConfig2(onlyFromConfig2Keys, config, config2); priorityFromConfig2(priorityFromConfig2Keys, config, config1, config2); diff --git a/src/core/request.ts b/src/core/request.ts index a577de8..92030d9 100644 --- a/src/core/request.ts +++ b/src/core/request.ts @@ -1,67 +1,74 @@ -import { AxiosRequestConfig, AxiosResponse, Response } from '../types'; -import { isString, isUndefined } from '../helpers/utils'; -import transformRequest from './transformRequest'; -import transformResponse from './transformResponse'; -import createError from './createError'; +import { assert, isFunction, isPlainObject } from '../utils'; +import { AxiosAdapterRequestConfig, AdapterRequestMethod } from './adapter'; +import { AxiosRequestConfig, AxiosResponse, AxiosResponseError } from './Axios'; +import { isCancelToken } from './cancel'; +import { AxiosErrorResponse, createError } from './createError'; +import { generateType } from './generateType'; -/** - * 请求函数 - * - * @param config Axios 请求配置 - */ -export default function request(config: AxiosRequestConfig): Promise { - return new Promise(function dispatchAdapter(resolve, reject): void { - const { adapter, cancelToken } = config; - const requestConfig = transformRequest(config); - - /** - * 捕获错误 - * - * @param message 错误信息 - * @param response Axios 响应体 - */ - function catchError(message: any, response?: AxiosResponse): void { - if (!isString(message)) { - message = message.fail; - } - - reject(createError(message, config, requestConfig, response)); +function tryToggleProgressUpdate( + adapterConfig: AxiosAdapterRequestConfig, + progressUpdate?: Function, +) { + if (isFunction(progressUpdate)) { + switch (adapterConfig.type) { + case 'upload': + if (isFunction(adapterConfig.onUploadProgress)) { + progressUpdate(adapterConfig.onUploadProgress); + } + break; + case 'download': + if (isFunction(adapterConfig.onDownloadProgress)) { + progressUpdate(adapterConfig.onDownloadProgress); + } + break; + default: } + } +} - if (isUndefined(adapter)) { - catchError('平台适配失败，您需要参阅文档使用自定义适配器手动适配当前平台'); +export function request( + config: AxiosRequestConfig, +): Promise> { + return new Promise((resolve, reject) => { + assert(isFunction(config.adapter), 'adapter 需要是一个 Function 类型'); - return; - } - - /** - * 效验状态码 - * - * @param res 请求结果 - */ - function handleResponse(res: Response): void { - const response = transformResponse(res, config); - - if (isUndefined(config.validateStatus) || config.validateStatus(response.status)) { - resolve(response); - } else { - catchError(`请求失败，状态码为 ${response.status}`, response); - } - } - - // 使用适配器发送请求 - const task = adapter({ - ...requestConfig, - success: handleResponse, - fail: catchError, + const adapterConfig: AxiosAdapterRequestConfig = Object.assign({}, config, { + url: config.url ?? '', + type: generateType(config), + method: (config.method?.toUpperCase() as AdapterRequestMethod) ?? 'GET', + success(response: AxiosResponse): void { + if ( + !isFunction(config.validateStatus) || + config.validateStatus(response.status) + ) { + resolve(response); + } else { + catchError('请求失败', response); + } + }, + fail(error: AxiosResponseError): void { + catchError('网络错误', error); + }, }); - // 如果存在取消令牌 - // 则调用取消令牌里的 listener 监听用户的取消操作 - if (!isUndefined(cancelToken)) { - cancelToken.listener.then(function onCanceled(reason): void { - if (!isUndefined(task)) { - task.abort(); + function catchError(message: string, response?: AxiosErrorResponse): void { + reject(createError(message, config, adapterConfig, response)); + } + + const adapterTask = config.adapter!(adapterConfig); + + if (isPlainObject(adapterTask)) { + tryToggleProgressUpdate(adapterConfig, adapterTask.onProgressUpdate); + } + + if (isCancelToken(config.cancelToken)) { + config.cancelToken.listener.then((reason: any) => { + if (isPlainObject(adapterTask)) { + tryToggleProgressUpdate(adapterConfig, adapterTask.offProgressUpdate); + + if (isFunction(adapterTask.abort)) { + adapterTask.abort(); + } } reject(reason); diff --git a/src/core/transformData.ts b/src/core/transformData.ts index e0f5335..19e39f6 100644 --- a/src/core/transformData.ts +++ b/src/core/transformData.ts @@ -1,27 +1,31 @@ -import { Data, Headers, TransformData } from '../types'; -import { isUndefined } from '../helpers/utils'; +import { isArray, isUndefined } from '../utils'; +import { + AxiosRequestData, + AxiosRequestFormData, + AxiosResponseHeaders, +} from './Axios'; -/** - * 转换数据 - * - * @param data 请求数据/响应数据 - * @param headers 请求头/响应头 - * @param transforms 请求数据转换函数/响应数据转换函数 - */ -export default function transformData( - data: Data, - headers: Headers, - transforms?: TransformData | TransformData[] -): Data { +export interface AxiosTransformer { + ( + data?: AxiosRequestData | AxiosRequestFormData, + headers?: AxiosResponseHeaders, + ): AxiosRequestData | AxiosRequestFormData; +} + +export function transformData( + data?: AxiosRequestData | AxiosRequestFormData, + headers?: AxiosResponseHeaders, + transforms?: AxiosTransformer | AxiosTransformer[], +): AxiosRequestData | AxiosRequestFormData | undefined { if (isUndefined(transforms)) { return data; } - if (!Array.isArray(transforms)) { + if (!isArray(transforms)) { transforms = [transforms]; } - transforms.forEach((transform: TransformData) => { + transforms.forEach((transform: AxiosTransformer) => { data = transform(data, headers); }); diff --git a/src/core/transformMethod.ts b/src/core/transformMethod.ts deleted file mode 100644 index 2ca0076..0000000 --- a/src/core/transformMethod.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { AliasMethod, AdapterMethod, Method } from '../types'; - -/** - * 请求方法转全小写 - * - * @param config Axios 请求配置 - */ -export function methodToLowercase(method: Method = 'get'): AliasMethod { - return method.toLowerCase() as AliasMethod; -} - -/** - * 请求方法转全大写 - * - * @param config Axios 请求配置 - */ -export function methodToUppercase(method: Method = 'GET'): AdapterMethod { - return method.toUpperCase() as AdapterMethod; -} diff --git a/src/core/transformRequest.ts b/src/core/transformRequest.ts deleted file mode 100644 index 4ae08ee..0000000 --- a/src/core/transformRequest.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { AxiosRequestConfig, RequestConfig } from '../types'; -import { pick } from '../helpers/utils'; -import isAbsoluteURL from '../helpers/isAbsoluteURL'; -import combineURL from '../helpers/combineURL'; -import dynamicURL from 'src/helpers/dynamicURL'; -import buildURL from '../helpers/buildURL'; -import { methodToUppercase } from './transformMethod'; - -/** - * 根据配置中的 baseURL 和 url 和 params 生成完整 URL - * - * @param config Axios 请求配置 - */ -function transformURL(config: AxiosRequestConfig): string { - const { baseURL = '', params } = config; - let { url = '' } = config; - - url = isAbsoluteURL(url) ? url : combineURL(baseURL, url); - url = dynamicURL(url, params); - return buildURL(url, config.params, config.paramsSerializer); -} - -/** - * Axios 请求配置转换成各大平台通用请求配置 - * - * 抹平差异 - * - * @param config Axios 请求配置 - */ -export default function transformRequest( - config: AxiosRequestConfig, -): RequestConfig { - return { - url: transformURL(config), - - method: methodToUppercase(config.method), - - header: config.headers, - - ...pick( - config, - 'data', - 'headers', - 'dataType', - 'responseType', - 'timeout', - 'enableHttp2', - 'enableQuic', - 'enableCache', - 'sslVerify', - ), - } as RequestConfig; -} diff --git a/src/core/transformResponse.ts b/src/core/transformResponse.ts deleted file mode 100644 index 0a81505..0000000 --- a/src/core/transformResponse.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { AxiosRequestConfig, AxiosResponse, Response } from '../types'; -import { pick } from '../helpers/utils'; - -/** - * 各大平台通用响应体转成 Axios 响应体 - * - * 抹平差异 - * - * @param response 通用响应体 - * @param config Axios 请求配置 - */ -export default function transformResponse( - response: Response, - config: AxiosRequestConfig -): AxiosResponse { - const status = response.statusCode ?? response.status ?? 400; - - const headers = response.header ?? response.headers ?? {}; - - const statusText = status === 200 ? 'OK' : status === 400 ? 'Bad Adapter' : ''; - - return { - status, - statusText, - headers, - config, - ...pick(response, 'data', 'cookies', 'profile'), - }; -} diff --git a/src/core/transformURL.ts b/src/core/transformURL.ts new file mode 100644 index 0000000..e6a4685 --- /dev/null +++ b/src/core/transformURL.ts @@ -0,0 +1,15 @@ +import { buildURL, combineURL, dynamicURL, isAbsoluteURL } from '../utils'; +import { AxiosRequestConfig } from './Axios'; + +export function transformURL(config: AxiosRequestConfig): string { + let url = config.url ?? ''; + + if (!isAbsoluteURL(url)) { + url = combineURL(config.baseURL, url); + } + + url = dynamicURL(url, config.params); + url = buildURL(url, config.params, config.paramsSerializer); + + return url; +} diff --git a/src/defaults.ts b/src/defaults.ts index b89c0e4..88ef436 100644 --- a/src/defaults.ts +++ b/src/defaults.ts @@ -1,20 +1,9 @@ -import { AxiosRequestConfig } from './types'; -import adaptive from './adaptive'; +import { getAdapterDefault } from './core/adapter'; +import { AxiosRequestConfig } from './core/Axios'; const defaults: AxiosRequestConfig = { - /** - * 适配器 - */ - adapter: adaptive(), - - /** - * 请求方法 - */ + adapter: getAdapterDefault(), method: 'get', - - /** - * 请求头 - */ headers: { common: { Accept: 'application/json, test/plain, */*', @@ -32,49 +21,15 @@ const defaults: AxiosRequestConfig = { trace: {}, connect: {}, }, - - /** - * 状态码效验 - * - * @param status 状态码 - */ - validateStatus: function validateStatus(status: number): boolean { + validateStatus(status: number): boolean { return status >= 200 && status < 300; }, - - /** - * 超时时间 - */ timeout: 10000, - - /** - * 响应数据格式 - */ dataType: 'json', - - /** - * 响应数据类型 - */ responseType: 'text', - - /** - * 开启 http2 - */ enableHttp2: false, - - /** - * 开启 quic - */ enableQuic: false, - - /** - * 开启 cache - */ enableCache: false, - - /** - * 验证 ssl 证书 - */ sslVerify: true, }; diff --git a/src/helpers/buildURL.ts b/src/helpers/buildURL.ts deleted file mode 100644 index d3cc6b6..0000000 --- a/src/helpers/buildURL.ts +++ /dev/null @@ -1,78 +0,0 @@ -import { AnyObject, Params } from '../types'; -import { encode, isPlainObject, isDate, isUndefined, isNull } from './utils'; - -/** - * 通过请求地址和序列化参数生成新的请求地址 - * - * @param url 请求地址 - * @param serializedParams 序列化参数 - */ -function generateURL(url: string, serializedParams: string): string { - // 移除 hash - const hashIndex = url.indexOf('#'); - - if (hashIndex !== -1) { - url = url.slice(0, hashIndex); - } - - if (serializedParams === '') { - return url; - } - - // 拼接前缀 - const prefix = url.indexOf('?') === -1 ? '?' : '&'; - - serializedParams = `${prefix}${serializedParams}`; - - return `${url}${serializedParams}`; -} - -/** - * 默认参数序列化 - * - * @param params 请求参数 - */ -function paramsSerialization(params: AnyObject): string { - const parts: string[] = []; - - Object.entries(params).forEach(function encodeKeyValue([key, value]): void { - if (isNull(value) || isUndefined(value) || value !== value) { - return; - } - - // 如果值是一个数组, 则特殊处理 key - if (Array.isArray(value)) { - key += '[]'; - } - - // 转成数组统一处理 - const values: any[] = [].concat(value); - - values.forEach((val: any): void => { - if (isPlainObject(val)) { - val = JSON.stringify(val); - } else if (isDate(val)) { - val = val.toISOString(); - } - - parts.push(`${encode(key)}=${encode(val)}`); - }); - }); - - return parts.join('&'); -} - -/** - * 处理 URL 参数 - * - * @param url 请求地址 - * @param params 请求参数 - * @param paramsSerializer 自定义参数序列化 - */ -export default function buildURL( - url: string, - params: Params = {}, - paramsSerializer = paramsSerialization -): string { - return generateURL(url, paramsSerializer(params)); -} diff --git a/src/helpers/combineURL.ts b/src/helpers/combineURL.ts deleted file mode 100644 index aeac200..0000000 --- a/src/helpers/combineURL.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * 拼接 baseURL 和 url 获得完整的 URL - * - * combineURL('1/2///','////3/4') => '1/2/3/4' - */ -export default function combineURL(baseURL: string, url: string): string { - return `${baseURL.replace(/\/*$/, '')}/${url.replace(/^\/*/, '')}`; -} diff --git a/src/helpers/dynamicURL.ts b/src/helpers/dynamicURL.ts deleted file mode 100644 index 56b3966..0000000 --- a/src/helpers/dynamicURL.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Params } from '../types'; -import { isPlainObject } from './utils'; - -const dynamicREG = /\/?(:([a-zA-Z_$][\w-$]?))\/??/g; - -export default function dynamicURL(url: string, params?: Params): string { - if (!isPlainObject(params)) { - return url; - } - - return url.replace(dynamicREG, (key1, key2, key3) => - key1.replace(key2, params[key3]), - ); -} diff --git a/src/helpers/isAbsoluteURL.ts b/src/helpers/isAbsoluteURL.ts deleted file mode 100644 index 25bbfa8..0000000 --- a/src/helpers/isAbsoluteURL.ts +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 检查是否是一个绝对 URL - * - * xxx:// 或者 "//" 开头, 视为绝对地址 - * - * @param url 需要检查的 URL - */ -export default function isAbsoluteURL(url: string): boolean { - return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url); -} diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts deleted file mode 100644 index 749833e..0000000 --- a/src/helpers/utils.ts +++ /dev/null @@ -1,123 +0,0 @@ -import { AnyObject, ObjectTree } from '../types'; - -const _toString = Object.prototype.toString; - -/** - * 对字符串进行编码转换 - * - * @param str 字符串 - */ -export function encode(str: string): string { - return encodeURIComponent(str) - .replace(/%40/gi, '@') - .replace(/%3A/gi, ':') - .replace(/%24/g, '$') - .replace(/%2C/gi, ',') - .replace(/%20/g, '+') - .replace(/%5B/gi, '[') - .replace(/%5D/gi, ']'); -} - -/** - * 是否是 Date - */ -export function isDate(date: unknown): date is Date { - return _toString.call(date) === '[object Date]'; -} - -/** - * 是否是普通对象 - */ -export function isPlainObject( - value: unknown -): value is [T] extends never[] ? AnyObject : T { - return _toString.call(value) === '[object Object]'; -} - -/** - * 是否是 undefined - */ -export function isUndefined(value: unknown): value is undefined { - return typeof value === 'undefined'; -} - -/** - * 是否是字符型 - */ -export function isString(value: unknown): value is number { - return typeof value === 'string'; -} - -/** - * 是否是 Null - */ -export function isNull(value: unknown): value is null { - return value === null; -} - -/** - * 深度合并多个对象 - * - * @param objs n 个对象 - */ -export function deepMerge(...objs: ObjectTree[]): [T] extends never[] ? ObjectTree : T { - const result: ObjectTree = {}; - - function assignValue(key: string, val: unknown) { - // 如果当前结果和当前值都为普通对象 - // 递归进行深度合并 - if (isPlainObject(result[key]) && isPlainObject(val)) { - result[key] = deepMerge(result[key] as ObjectTree, val as ObjectTree); - } - // 如果只有当前值为普通对象 - // 直接深拷贝当前值 - else if (isPlainObject(val)) { - result[key] = deepMerge({}, val as ObjectTree); - } - // 如果都不是普通对象 - // 直接赋值 - else { - result[key] = val; - } - } - - objs.forEach(function assignObj(obj: ObjectTree): void { - Object.entries(obj).forEach(function ([key, value]) { - assignValue(key, value); - }); - }); - - return result as [T] extends never[] ? ObjectTree : T; -} - -/** - * 从对象中提取一部分属性 - * - * @param obj 源对象 - * @param keys 需要提取的 key - */ -export function pick(obj: T, ...keys: K[]): Pick { - const _pick: Partial = {}; - - keys.forEach(function pickKey(key: K) { - _pick[key] = obj[key]; - }); - - return _pick as Pick; -} - -/** - * 从对象中剔除一部分属性 - * - * @param obj 源对象 - * @param keys 需要剔除的 key - */ -export function omit(obj: T, ...keys: K[]): Omit { - const _omit = { ...obj }; - - keys.forEach(function omitKey(key: K) { - delete _omit[key]; - }); - - return _omit; -} diff --git a/src/index.ts b/src/index.ts index e1c35dc..01b9049 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,15 @@ import axios from './axios'; -export * from './types'; - +export { + AxiosRequestConfig, + AxiosRequestFormData, + AxiosResponse, + AxiosResponseError, +} from './core/Axios'; +export { + AxiosAdapterRequestConfig, + AxiosAdapter, + AxiosPlatform, +} from './core/adapter'; +export { AxiosInstance, AxiosStatic } from './axios'; export default axios; diff --git a/src/types.ts b/src/types.ts deleted file mode 100644 index c86c9df..0000000 --- a/src/types.ts +++ /dev/null @@ -1,755 +0,0 @@ -/** - * 任意值对象 - */ -export declare interface AnyObject { - [x: string]: T; -} - -/** - * 请求方法 - */ -export declare type AdapterMethod = - | 'OPTIONS' - | 'GET' - | 'HEAD' - | 'POST' - | 'PUT' - | 'DELETE' - | 'TRACE' - | 'CONNECT'; - -/** - * 请求方法别名 - */ -export declare type AliasMethod = - | 'options' - | 'get' - | 'head' - | 'post' - | 'put' - | 'delete' - | 'trace' - | 'connect'; - -/** - * Axios 请求方法 - */ -export declare type Method = AliasMethod | AdapterMethod; - -/** - * Axios 参数 - */ -export declare type Params = AnyObject; - -/** - * Axios 数据 - */ -export declare type Data = string | AnyObject | ArrayBuffer; - -/** - * Axios 头 - */ -export declare interface Headers - extends Partial>> { - /** - * 自定义配置 - */ - [x: string]: AnyObject | string | undefined; -} - -/** - * 通用请求配置 - */ -export declare interface RequestConfig { - /** - * 接口地址 - */ - url: string; - - /** - * HTTP 请求方法 - */ - method: AdapterMethod; - - /** - * 请求数据 - */ - data: Data; - - /** - * 请求头 同 headers - */ - header: AnyObject; - - /** - * 请求头 同 header - */ - headers: AnyObject; - - /** - * 返回的数据格式 - */ - dataType?: 'json' | '其他'; - - /** - * 响应的数据类型 - */ - responseType?: 'text' | 'arraybuffer'; - - /** - * 超时时间 - */ - timeout?: number; - - /** - * 开启 http2 - */ - enableHttp2?: boolean; - - /** - * 开启 quic - */ - enableQuic?: boolean; - - /** - * 开启 cache - */ - enableCache?: boolean; - - /** - * 验证 ssl 证书 - */ - sslVerify?: boolean; -} - -/** - * 通用响应体 - */ -export declare interface Response { - /** - * 响应状态码 - */ - statusCode?: number; - - /** - * 响应状态码 - */ - status?: number; - - /** - * 响应头 Headers - */ - header?: AnyObject; - - /** - * 响应头 Headers - */ - headers?: Headers; - - /** - * 响应数据 - */ - data: Data; - - /** - * 开发者服务器返回的 cookies，格式为字符串数组 - */ - cookies?: string[]; - - /** - * 网络请求过程中一些关键时间点的耗时信息 - */ - profile?: AnyObject; -} - -/** - * 适配器请求配置 - */ -export declare interface AdapterRequestConfig extends RequestConfig { - /** - * 成功的响应函数 - */ - success: (res: Response) => void; - - /** - * 失败的响应函数 - */ - fail: (err: unknown) => void; -} - -/** - * 适配器请求任务 - */ -export declare interface AdapterRequestTask { - /** - * 取消请求 - */ - abort(): void; -} - -/** - * 适配器 - */ -export declare interface Adapter { - (config: AdapterRequestConfig): AdapterRequestTask | undefined; -} - -/** - * 平台 - */ -export declare interface Platform { - request: Adapter; -} - -/** - * 转换数据函数 - */ -export declare interface TransformData { - (data: Data, headers: Headers): Data; -} - -/** - * 错误处理程序 - */ -export declare interface ErrorHandler { - (error: any): Promise | any; -} - -/** - * Axios 请求配置 - */ -export declare interface AxiosRequestConfig { - /** - * 自定义适配器 - */ - adapter?: Adapter; - - /** - * 基础地址 - */ - baseURL?: string; - - /** - * 请求地址 - */ - url?: string; - - /** - * 请求方法 - */ - method?: Method; - - /** - * 请求参数 - */ - params?: Params; - - /** - * 请求数据 - */ - data?: Data; - - /** - * 请求头 - */ - headers?: Headers; - - /** - * 自定义合法状态码 - */ - validateStatus?: (status: number) => boolean; - - /** - * 自定义参数序列化 - */ - paramsSerializer?: (params?: AnyObject) => string; - - /** - * 转换请求数据 - */ - transformRequest?: TransformData | TransformData[]; - - /** - * 转换响应数据 - */ - transformResponse?: TransformData | TransformData[]; - - /** - * 自定义错误处理 - */ - errorHandler?: ErrorHandler; - - /** - * 取消令牌 - */ - cancelToken?: CancelToken; - - /** - * 超时时间 - */ - timeout?: number; - - /** - * 响应数据格式 - */ - dataType?: 'json' | '其他'; - - /** - * 响应数据类型 - */ - responseType?: 'text' | 'arraybuffer'; - - /** - * 开启 http2 - */ - enableHttp2?: boolean; - - /** - * 开启 quic - */ - enableQuic?: boolean; - - /** - * 开启 cache - */ - enableCache?: boolean; - - /** - * 验证 ssl 证书 - */ - sslVerify?: boolean; - - [key: string]: unknown; -} - -/** - * Axios 响应体 - */ -export declare interface AxiosResponse { - /** - * 状态码 - */ - status: number; - - /** - * 状态文本 - */ - statusText: string; - - /** - * 服务端返回的数据 - */ - data: T; - - /** - * 响应头 - */ - headers: Headers; - - /** - * Axios 请求配置 - */ - config: AxiosRequestConfig; - - /** - * 开发者服务器返回的 cookies，格式为字符串数组 - */ - cookies?: string[]; - - /** - * 网络请求过程中一些关键时间点的耗时信息 - */ - profile?: AnyObject; -} - -/** - * 拦截器成功的回调函数 - */ -export declare interface InterceptorResolved { - (value: T): Promise | T; -} - -/** - * 拦截器失败的回调函数 - */ -export declare interface InterceptorRejected { - (error: any): any; -} - -/** - * 拦截器 - */ -export declare interface Interceptor { - /** - * 拦截器成功的回调函数 - */ - resolved: InterceptorResolved; - - /** - * 拦截器失败的回调函数 - */ - rejected?: InterceptorRejected; -} - -/** - * 拦截器执行器 - */ -export declare interface InterceptorExecutor { - (interceptor: Interceptor): void; -} - -/** - * 拦截器管理器 - */ -export declare interface InterceptorManager { - [x: string]: any; - /** - * 添加拦截器 - * - * @param resolved 成功的回调函数 - * @param rejected 失败的回调函数 - */ - use(resolved: InterceptorResolved, rejected?: InterceptorRejected): number; - - /** - * 删除拦截器 - * - * @param id 拦截器 id - */ - eject(id: number): void; - - /** - * 遍历所有拦截器 - * - * @param executor 拦截器执行器 - * @param reverse 是否倒序遍历 - */ - forEach(executor: InterceptorExecutor, reverse?: 'reverse'): void; -} - -/** - * Axios 拦截器 - */ -export declare interface Interceptors { - /** - * request 请求拦截器 - */ - request: InterceptorManager; - - /** - * response 响应拦截器 - */ - response: InterceptorManager; -} - -/** - * Axios 实例 - */ -export declare interface Axios { - /** - * 默认配置 - */ - defaults: AxiosRequestConfig; - - /** - * Axios 拦截器 - */ - interceptors: Interceptors; - - /** - * 根据配置中的 url 和 params 生成一个 URI - * - * @param config 请求配置 - */ - getUri(config: AxiosRequestConfig): string; - - /** - * 发送 HTTP 请求 - * - * @param config 请求配置 - */ - request( - config: AxiosRequestConfig, - ): Promise>; - - /** - * 发送 HTTP 请求 OPTIONS - * - * @param url 请求地址 - * @param config 额外配置 - */ - options( - url: string, - config?: AxiosRequestConfig, - ): Promise>; - - /** - * 发送 HTTP 请求 GET - * - * @param url 请求地址 - * @param params 请求参数 - * @param config 额外配置 - */ - get( - url: string, - params?: Params, - config?: AxiosRequestConfig, - ): Promise>; - - /** - * 发送 HTTP 请求 HEAD - * - * @param url 请求地址 - * @param params 请求参数 - * @param config 额外配置 - */ - head( - url: string, - params?: Params, - config?: AxiosRequestConfig, - ): Promise>; - - /** - * 发送 HTTP 请求 POST - * - * @param url 请求地址 - * @param data 请求数据 - * @param config 额外配置 - */ - post( - url: string, - data?: Data, - config?: AxiosRequestConfig, - ): Promise>; - - /** - * 发送 HTTP 请求 PUT - * - * @param url 请求地址 - * @param data 请求数据 - * @param config 额外配置 - */ - put( - url: string, - data?: Data, - config?: AxiosRequestConfig, - ): Promise>; - - /** - * 发送 HTTP 请求 DELETE - * - * @param url 请求地址 - * @param params 请求参数 - * @param config 额外配置 - */ - delete( - url: string, - params?: Params, - config?: AxiosRequestConfig, - ): Promise>; - - /** - * 发送 HTTP 请求 TRACE - * - * @param url 请求地址 - * @param config 额外配置 - */ - trace( - url: string, - config?: AxiosRequestConfig, - ): Promise>; - - /** - * 发送 HTTP 请求 CONNECT - * - * @param url 请求地址 - * @param config 额外配置 - */ - connect( - url: string, - config?: AxiosRequestConfig, - ): Promise>; -} - -/** - * Axios 类接口 - */ -export declare interface AxiosConstructor { - new (config?: AxiosRequestConfig): Axios; -} - -/** - * AxiosError 类继承自 Error - */ -export declare interface AxiosError extends Error { - /** - * 是 Axios 错误 - */ - isAxiosError: boolean; - - /** - * 请求配置 - */ - config: AxiosRequestConfig; - - /** - * 通用请求配置 - */ - request: RequestConfig; - - /** - * Axios 响应体 - */ - response?: AxiosResponse; -} - -/** - * 取消请求 - */ -export declare interface Cancel { - /** - * 取消信息 - */ - message?: string; - - /** - * 序列化 - */ - toString(): string; -} - -/** - * 取消请求类接口 - */ -export declare interface CancelConstructor { - new (message?: string): Cancel; -} - -/** - * 取消操作 - */ -export declare interface CancelAction { - (message?: string): void; -} - -/** - * 取消操作执行器 - */ -export declare interface CancelExecutor { - (cancel: CancelAction): void; -} - -/** - * 取消令牌 - */ -export declare interface CancelToken { - /** - * 取消时被触发 - */ - listener: Promise; - - /** - * 如果已经取消, 则抛出取消对象 - */ - throwIfRequested(): void; -} - -/** - * 取消令牌 source - */ -export declare interface CancelTokenSource { - /** - * 取消令牌 - */ - token: CancelToken; - - /** - * 取消操作 - */ - cancel: CancelAction; -} - -/** - * 取消令牌类接口 - */ -export declare interface CancelTokenConstructor { - new (executor: CancelExecutor): CancelToken; - - /** - * 返回一个 CancelTokenSource - * - * CancelTokenSource.token 是一个 CancelToken 对象 - * - * CancelTokenSource.cancel 是一个 CancelAction 函数 - * - * 调用 CancelTokenSource.cancel('这里可以填写您的错误信息') - * - * 取消请求 CancelTokenSource.token - */ - source(): CancelTokenSource; -} - -/** - * Axios 实例基础拓展 - * - * * 支持两种函数调用方式 - */ -export declare interface AxiosBaseInstance extends Axios { - /** - * 发送 HTTP 请求 - * - * 调用方式一 - * - * @param config 请求配置 - */ - (config: AxiosRequestConfig): Promise>; - - /** - * 发送 HTTP 请求 - * - * 调用方式二 - * - * @param url 请求地址 - * @param config 额外配置 - */ - (url: string, config?: AxiosRequestConfig): Promise< - AxiosResponse - >; -} - -/** - * Axios 实例拓展 - * - * * 支持两种函数调用方式 - * - * * 同时拓展了一些静态属性和方法 - */ -export declare interface AxiosInstance extends AxiosBaseInstance { - /** - * 创建 Axios 实例基础拓展 - * - * @param defaults 自定义默认配置 - */ - create(defaults?: AxiosRequestConfig): AxiosBaseInstance; - - /** - * Axios 类 - */ - Axios: AxiosConstructor; - - /** - * 取消令牌 类 - */ - CancelToken: CancelTokenConstructor; - - /** - * 检查错误是否来自取消请求 - * - * @param value 判断的值 - */ - isCancel: (value: any) => boolean; -} - -export interface ObjectTree { - [key: string]: T | ObjectTree; -} diff --git a/src/utils.ts b/src/utils.ts new file mode 100644 index 0000000..64c11ab --- /dev/null +++ b/src/utils.ts @@ -0,0 +1,208 @@ +import { AxiosPlatform } from './core/adapter'; +import { AxiosRequestParams } from './core/Axios'; + +const _toString = Object.prototype.toString; + +export function isDate(date: any): date is Date { + return _toString.call(date) === '[object Date]'; +} + +export function isPlainObject( + value: any, +): value is [T] extends never[] ? AnyObject : T { + return _toString.call(value) === '[object Object]'; +} + +export function isUndefined(value: any): value is undefined { + return typeof value === 'undefined'; +} + +export function isString(value: any): value is string { + return typeof value === 'string'; +} + +export function isNull(value: any): value is null { + return value === null; +} + +export function isFunction( + value: any, +): value is T { + return typeof value === 'function'; +} + +export function isArray(value: any): value is T[] { + return Array.isArray(value); +} + +export function isEmptyArray(value: any): value is [] { + return isArray(value) && value.length === 0; +} + +export function isPlatform(value: any): value is AxiosPlatform { + return ( + isPlainObject(value) && + isFunction(value.request) && + isFunction(value.upload) && + isFunction(value.download) + ); +} + +export function deepMerge(...objs: T[]): T { + const result: AnyObject = {}; + + objs.forEach((obj: AnyObject) => + Object.keys(obj).forEach((key) => { + const val = obj[key]; + const resultVal = result[key]; + + if (isPlainObject(resultVal) && isPlainObject(val)) { + result[key] = deepMerge(resultVal, val); + } else if (isPlainObject(val)) { + result[key] = deepMerge(val); + } else { + result[key] = val; + } + }), + ); + + return result as T; +} + +export function pick( + obj: T, + ...keys: K[] +): Pick { + const _pick: Partial = {}; + + keys.forEach((key: K) => (_pick[key] = obj[key])); + + return _pick as Pick; +} + +export function omit( + obj: T, + ...keys: K[] +): Omit { + const _omit = Object.assign({}, obj); + + keys.forEach((key: K) => delete _omit[key]); + + return _omit; +} + +export function revisePlatformApiNames(platform: AnyObject): AxiosPlatform { + return { + request: platform.request ?? platform.httpRequest, + upload: platform.upload ?? platform.uploadFile, + download: platform.download ?? platform.downloadFile, + }; +} + +export function assert(condition: boolean, msg: string) { + if (!condition) { + throwError(msg); + } +} + +export function throwError(msg: string): void { + throw new Error(`[axios-miniprogram]:${msg}`); +} + +function encode(str: string): string { + return encodeURIComponent(str) + .replace(/%40/gi, '@') + .replace(/%3A/gi, ':') + .replace(/%24/g, '$') + .replace(/%2C/gi, ',') + .replace(/%20/g, '+') + .replace(/%5B/gi, '[') + .replace(/%5D/gi, ']'); +} + +function generateURL(url: string, serializedParams: string): string { + const hashIndex = url.indexOf('#'); + + if (hashIndex !== -1) { + url = url.slice(0, hashIndex); + } + + if (serializedParams === '') { + return url; + } + + const prefix = url.indexOf('?') === -1 ? '?' : '&'; + + serializedParams = `${prefix}${serializedParams}`; + + return `${url}${serializedParams}`; +} + +function paramsSerialization(params?: AxiosRequestParams): string { + if (!isPlainObject(params)) { + return ''; + } + + const parts: string[] = []; + + Object.keys(params).forEach((key): void => { + const value = params[key]; + + if (isNull(value) || isUndefined(value) || value !== value) { + return; + } + + if (Array.isArray(value)) { + key += '[]'; + } + + const values = [].concat(value); + + values.forEach((val: any): void => { + if (isPlainObject(val)) { + val = JSON.stringify(val); + } else if (isDate(val)) { + val = val.toISOString(); + } + + parts.push(`${encode(key)}=${encode(val)}`); + }); + }); + + return parts.join('&'); +} + +export function buildURL( + url = '', + params?: AxiosRequestParams, + paramsSerializer = paramsSerialization, +): string { + if (!isPlainObject(params)) { + return url; + } + + return generateURL(url, paramsSerializer(params)); +} + +const combineREG = /\/{2,}/g; +export function combineURL(baseURL = '', url: string): string { + const separator = '/'; + + return `${baseURL}${separator}${url}`.replace(combineREG, separator); +} + +const dynamicREG = /\/?(:([a-zA-Z_$][\w-$]*))\/??/g; +export function dynamicURL(url: string, params?: AxiosRequestParams): string { + if (!isPlainObject(params)) { + return url; + } + + return url.replace(dynamicREG, (key1, key2, key3) => + key1.replace(key2, params[key3]), + ); +} + +const absoluteREG = /^([a-z][a-z\d+\-.]*:)?\/\//i; +export function isAbsoluteURL(url: string): boolean { + return absoluteREG.test(url); +} diff --git a/tsconfig.json b/tsconfig.json index 060c834..50e2eca 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,11 +2,13 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist", - "sourceMap": true, - "target": "esnext", + "target": "ES5", "module": "esnext", + "sourceMap": true, "strict": true, - "lib": ["esnext"] + "declaration": true, + "declarationDir": "dist/@types/axios-miniprogram", }, - "include": ["src", "__tests__"] + "include": ["src/**/*", "global.d.ts"], + "exclude": ["node_modules"] } diff --git a/yarn.lock b/yarn.lock index 3472763..f9c6a24 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,32 +9,32 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== dependencies: "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8", "@babel/compat-data@^7.14.0": +"@babel/compat-data@^7.13.15": version "7.14.0" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919" integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q== "@babel/core@^7.1.0", "@babel/core@^7.14.0", "@babel/core@^7.7.5": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz#47299ff3ec8d111b493f1a9d04bf88c04e728d88" - integrity sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw== + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz#5395e30405f0776067fbd9cf0884f15bfb770a38" + integrity sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.14.0" + "@babel/generator" "^7.14.3" "@babel/helper-compilation-targets" "^7.13.16" - "@babel/helper-module-transforms" "^7.14.0" + "@babel/helper-module-transforms" "^7.14.2" "@babel/helpers" "^7.14.0" - "@babel/parser" "^7.14.0" + "@babel/parser" "^7.14.3" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.14.0" + "@babel/traverse" "^7.14.2" + "@babel/types" "^7.14.2" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -42,12 +42,12 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.14.0": - version "7.14.1" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz#1f99331babd65700183628da186f36f63d615c93" - integrity sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ== +"@babel/generator@^7.14.2", "@babel/generator@^7.14.3": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz#0c2652d91f7bddab7cccc6ba8157e4f40dcedb91" + integrity sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA== dependencies: - "@babel/types" "^7.14.1" + "@babel/types" "^7.14.2" jsesc "^2.5.1" source-map "^0.5.0" @@ -58,15 +58,7 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc" - integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA== - dependencies: - "@babel/helper-explode-assignable-expression" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.13.8": +"@babel/helper-compilation-targets@^7.13.16": version "7.13.16" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c" integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== @@ -76,55 +68,26 @@ browserslist "^4.14.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0": - version "7.14.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.1.tgz#1fe11b376f3c41650ad9fedc665b0068722ea76c" - integrity sha512-r8rsUahG4ywm0QpGcCrLaUSOuNAISR3IZCg4Fx05Ozq31aCUrQsTLH6KPxy0N5ULoQ4Sn9qjNdGNtbPWAC6hYg== +"@babel/helper-create-class-features-plugin@^7.14.3": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.3.tgz#832111bcf4f57ca57a4c5b1a000fc125abc6554a" + integrity sha512-BnEfi5+6J2Lte9LeiL6TxLWdIlEv9Woacc1qXzXBgbikcOzMRM2Oya5XGg/f/ngotv1ej2A/b+3iJH8wbS1+lQ== dependencies: "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-function-name" "^7.12.13" + "@babel/helper-function-name" "^7.14.2" "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.12" + "@babel/helper-replace-supers" "^7.14.3" "@babel/helper-split-export-declaration" "^7.12.13" -"@babel/helper-create-regexp-features-plugin@^7.12.13": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7" - integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - regexpu-core "^4.7.1" - -"@babel/helper-define-polyfill-provider@^0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz#a640051772045fedaaecc6f0c6c69f02bdd34bf1" - integrity sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw== - dependencies: - "@babel/helper-compilation-targets" "^7.13.0" - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/traverse" "^7.13.0" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - semver "^6.1.2" - -"@babel/helper-explode-assignable-expression@^7.12.13": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f" - integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA== - dependencies: - "@babel/types" "^7.13.0" - -"@babel/helper-function-name@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" - integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA== +"@babel/helper-function-name@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2" + integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ== dependencies: "@babel/helper-get-function-arity" "^7.12.13" "@babel/template" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/types" "^7.14.2" "@babel/helper-get-function-arity@^7.12.13": version "7.12.13" @@ -133,14 +96,6 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-hoist-variables@^7.13.0": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz#1b1651249e94b51f8f0d33439843e33e39775b30" - integrity sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg== - dependencies: - "@babel/traverse" "^7.13.15" - "@babel/types" "^7.13.16" - "@babel/helper-member-expression-to-functions@^7.13.12": version "7.13.12" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72" @@ -148,17 +103,17 @@ dependencies: "@babel/types" "^7.13.12" -"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12": +"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.13.12": version "7.13.12" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== dependencies: "@babel/types" "^7.13.12" -"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz#8fcf78be220156f22633ee204ea81f73f826a8ad" - integrity sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw== +"@babel/helper-module-transforms@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5" + integrity sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA== dependencies: "@babel/helper-module-imports" "^7.13.12" "@babel/helper-replace-supers" "^7.13.12" @@ -166,8 +121,8 @@ "@babel/helper-split-export-declaration" "^7.12.13" "@babel/helper-validator-identifier" "^7.14.0" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.14.0" + "@babel/traverse" "^7.14.2" + "@babel/types" "^7.14.2" "@babel/helper-optimise-call-expression@^7.12.13": version "7.12.13" @@ -176,29 +131,20 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0": version "7.13.0" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== -"@babel/helper-remap-async-to-generator@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209" - integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-wrap-function" "^7.13.0" - "@babel/types" "^7.13.0" - -"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804" - integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw== +"@babel/helper-replace-supers@^7.13.12", "@babel/helper-replace-supers@^7.14.3": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz#ca17b318b859d107f0e9b722d58cf12d94436600" + integrity sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA== dependencies: "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.12" + "@babel/traverse" "^7.14.2" + "@babel/types" "^7.14.2" "@babel/helper-simple-access@^7.13.12": version "7.13.12" @@ -207,13 +153,6 @@ dependencies: "@babel/types" "^7.13.12" -"@babel/helper-skip-transparent-expression-wrappers@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf" - integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA== - dependencies: - "@babel/types" "^7.12.1" - "@babel/helper-split-export-declaration@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" @@ -221,7 +160,7 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0": +"@babel/helper-validator-identifier@^7.14.0": version "7.14.0" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== @@ -231,16 +170,6 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== -"@babel/helper-wrap-function@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4" - integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA== - dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - "@babel/helpers@^7.14.0": version "7.14.0" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62" @@ -259,146 +188,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0": - version "7.14.1" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47" - integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q== - -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a" - integrity sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.13.12" - -"@babel/plugin-proposal-async-generator-functions@^7.13.15": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz#80e549df273a3b3050431b148c892491df1bcc5b" - integrity sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-remap-async-to-generator" "^7.13.0" - "@babel/plugin-syntax-async-generators" "^7.8.4" - -"@babel/plugin-proposal-class-properties@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37" - integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-proposal-class-static-block@^7.13.11": - version "7.13.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz#6fcbba4a962702c17e5371a0c7b39afde186d703" - integrity sha512-fJTdFI4bfnMjvxJyNuaf8i9mVcZ0UhetaGEUHaHV9KEnibLugJkZAtXikR8KcYj+NYmI4DZMS8yQAyg+hvfSqg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-class-static-block" "^7.12.13" - -"@babel/plugin-proposal-dynamic-import@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d" - integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - -"@babel/plugin-proposal-export-namespace-from@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d" - integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - -"@babel/plugin-proposal-json-strings@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b" - integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-json-strings" "^7.8.3" - -"@babel/plugin-proposal-logical-assignment-operators@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a" - integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - -"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3" - integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - -"@babel/plugin-proposal-numeric-separator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db" - integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - -"@babel/plugin-proposal-object-rest-spread@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a" - integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g== - dependencies: - "@babel/compat-data" "^7.13.8" - "@babel/helper-compilation-targets" "^7.13.8" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.13.0" - -"@babel/plugin-proposal-optional-catch-binding@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107" - integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - -"@babel/plugin-proposal-optional-chaining@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866" - integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-proposal-private-methods@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787" - integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-proposal-private-property-in-object@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz#b1a1f2030586b9d3489cc26179d2eb5883277636" - integrity sha512-59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-create-class-features-plugin" "^7.14.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-private-property-in-object" "^7.14.0" - -"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba" - integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" +"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.14.3": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz#9b530eecb071fd0c93519df25c5ff9f14759f298" + integrity sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -414,34 +207,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3": +"@babel/plugin-syntax-class-properties@^7.8.3": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-syntax-class-static-block@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz#8e3d674b0613e67975ceac2776c97b60cafc5c9c" - integrity sha512-ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-dynamic-import@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" @@ -456,7 +228,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": +"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== @@ -470,7 +242,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3": +"@babel/plugin-syntax-numeric-separator@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== @@ -498,14 +270,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-private-property-in-object@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz#762a4babec61176fec6c88480dec40372b140c0b" - integrity sha512-bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.8.3": +"@babel/plugin-syntax-top-level-await@^7.8.3": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== @@ -519,365 +284,15 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-arrow-functions@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae" - integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-async-to-generator@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f" - integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg== - dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-remap-async-to-generator" "^7.13.0" - -"@babel/plugin-transform-block-scoped-functions@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4" - integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-block-scoping@^7.14.1": - version "7.14.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz#ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2" - integrity sha512-2mQXd0zBrwfp0O1moWIhPpEeTKDvxyHcnma3JATVP1l+CctWBuot6OJG8LQ4DnBj4ZZPSmlb/fm4mu47EOAnVA== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-classes@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b" - integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-split-export-declaration" "^7.12.13" - globals "^11.1.0" - -"@babel/plugin-transform-computed-properties@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed" - integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-destructuring@^7.13.17": - version "7.13.17" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27" - integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad" - integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-duplicate-keys@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de" - integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-exponentiation-operator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1" - integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-for-of@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062" - integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-function-name@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051" - integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ== - dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-literals@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9" - integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-member-expression-literals@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40" - integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-modules-amd@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz#589494b5b290ff76cf7f59c798011f6d77026553" - integrity sha512-CF4c5LX4LQ03LebQxJ5JZes2OYjzBuk1TdiF7cG7d5dK4lAdw9NZmaxq5K/mouUdNeqwz3TNjnW6v01UqUNgpQ== - dependencies: - "@babel/helper-module-transforms" "^7.14.0" - "@babel/helper-plugin-utils" "^7.13.0" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-commonjs@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz#52bc199cb581e0992edba0f0f80356467587f161" - integrity sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ== - dependencies: - "@babel/helper-module-transforms" "^7.14.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-simple-access" "^7.13.12" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-systemjs@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3" - integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A== - dependencies: - "@babel/helper-hoist-variables" "^7.13.0" - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-validator-identifier" "^7.12.11" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-umd@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz#2f8179d1bbc9263665ce4a65f305526b2ea8ac34" - integrity sha512-nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw== - dependencies: - "@babel/helper-module-transforms" "^7.14.0" - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9" - integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - -"@babel/plugin-transform-new-target@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c" - integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-object-super@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7" - integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/helper-replace-supers" "^7.12.13" - -"@babel/plugin-transform-parameters@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007" - integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-property-literals@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81" - integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-regenerator@^7.13.15": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39" - integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ== - dependencies: - regenerator-transform "^0.14.2" - -"@babel/plugin-transform-reserved-words@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695" - integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-runtime@^7.13.15": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz#2eddf585dd066b84102517e10a577f24f76a9cd7" - integrity sha512-d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA== - dependencies: - "@babel/helper-module-imports" "^7.13.12" - "@babel/helper-plugin-utils" "^7.13.0" - babel-plugin-polyfill-corejs2 "^0.2.0" - babel-plugin-polyfill-corejs3 "^0.2.0" - babel-plugin-polyfill-regenerator "^0.2.0" - semver "^6.3.0" - -"@babel/plugin-transform-shorthand-properties@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad" - integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-spread@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd" - integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" - -"@babel/plugin-transform-sticky-regex@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f" - integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-template-literals@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d" - integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-typeof-symbol@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f" - integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-typescript@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853" - integrity sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ== + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.3.tgz#44f67f725a60cccee33d9d6fee5e4f338258f34f" + integrity sha512-G5Bb5pY6tJRTC4ag1visSgiDoGgJ1u1fMUgmc2ijLkcIdzP83Q1qyZX4ggFQ/SkR+PNOatkaYC+nKcTlpsX4ag== dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" + "@babel/helper-create-class-features-plugin" "^7.14.3" "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-typescript" "^7.12.13" -"@babel/plugin-transform-unicode-escapes@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74" - integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-unicode-regex@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac" - integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/preset-env@^7.14.1": - version "7.14.1" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.1.tgz#b55914e2e68885ea03f69600b2d3537e54574a93" - integrity sha512-0M4yL1l7V4l+j/UHvxcdvNfLB9pPtIooHTbEhgD/6UGyh8Hy3Bm1Mj0buzjDXATCSz3JFibVdnoJZCrlUCanrQ== - dependencies: - "@babel/compat-data" "^7.14.0" - "@babel/helper-compilation-targets" "^7.13.16" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-validator-option" "^7.12.17" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12" - "@babel/plugin-proposal-async-generator-functions" "^7.13.15" - "@babel/plugin-proposal-class-properties" "^7.13.0" - "@babel/plugin-proposal-class-static-block" "^7.13.11" - "@babel/plugin-proposal-dynamic-import" "^7.13.8" - "@babel/plugin-proposal-export-namespace-from" "^7.12.13" - "@babel/plugin-proposal-json-strings" "^7.13.8" - "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8" - "@babel/plugin-proposal-numeric-separator" "^7.12.13" - "@babel/plugin-proposal-object-rest-spread" "^7.13.8" - "@babel/plugin-proposal-optional-catch-binding" "^7.13.8" - "@babel/plugin-proposal-optional-chaining" "^7.13.12" - "@babel/plugin-proposal-private-methods" "^7.13.0" - "@babel/plugin-proposal-private-property-in-object" "^7.14.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.12.13" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-class-static-block" "^7.12.13" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-private-property-in-object" "^7.14.0" - "@babel/plugin-syntax-top-level-await" "^7.12.13" - "@babel/plugin-transform-arrow-functions" "^7.13.0" - "@babel/plugin-transform-async-to-generator" "^7.13.0" - "@babel/plugin-transform-block-scoped-functions" "^7.12.13" - "@babel/plugin-transform-block-scoping" "^7.14.1" - "@babel/plugin-transform-classes" "^7.13.0" - "@babel/plugin-transform-computed-properties" "^7.13.0" - "@babel/plugin-transform-destructuring" "^7.13.17" - "@babel/plugin-transform-dotall-regex" "^7.12.13" - "@babel/plugin-transform-duplicate-keys" "^7.12.13" - "@babel/plugin-transform-exponentiation-operator" "^7.12.13" - "@babel/plugin-transform-for-of" "^7.13.0" - "@babel/plugin-transform-function-name" "^7.12.13" - "@babel/plugin-transform-literals" "^7.12.13" - "@babel/plugin-transform-member-expression-literals" "^7.12.13" - "@babel/plugin-transform-modules-amd" "^7.14.0" - "@babel/plugin-transform-modules-commonjs" "^7.14.0" - "@babel/plugin-transform-modules-systemjs" "^7.13.8" - "@babel/plugin-transform-modules-umd" "^7.14.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13" - "@babel/plugin-transform-new-target" "^7.12.13" - "@babel/plugin-transform-object-super" "^7.12.13" - "@babel/plugin-transform-parameters" "^7.13.0" - "@babel/plugin-transform-property-literals" "^7.12.13" - "@babel/plugin-transform-regenerator" "^7.13.15" - "@babel/plugin-transform-reserved-words" "^7.12.13" - "@babel/plugin-transform-shorthand-properties" "^7.12.13" - "@babel/plugin-transform-spread" "^7.13.0" - "@babel/plugin-transform-sticky-regex" "^7.12.13" - "@babel/plugin-transform-template-literals" "^7.13.0" - "@babel/plugin-transform-typeof-symbol" "^7.12.13" - "@babel/plugin-transform-unicode-escapes" "^7.12.13" - "@babel/plugin-transform-unicode-regex" "^7.12.13" - "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.14.1" - babel-plugin-polyfill-corejs2 "^0.2.0" - babel-plugin-polyfill-corejs3 "^0.2.0" - babel-plugin-polyfill-regenerator "^0.2.0" - core-js-compat "^3.9.0" - semver "^6.3.0" - -"@babel/preset-modules@^0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" - integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" - "@babel/plugin-transform-dotall-regex" "^7.4.4" - "@babel/types" "^7.4.4" - esutils "^2.0.2" - "@babel/preset-typescript@^7.13.0": version "7.13.0" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.13.0.tgz#ab107e5f050609d806fbb039bec553b33462c60a" @@ -887,13 +302,6 @@ "@babel/helper-validator-option" "^7.12.17" "@babel/plugin-transform-typescript" "^7.13.0" -"@babel/runtime@^7.14.0", "@babel/runtime@^7.8.4": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6" - integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA== - dependencies: - regenerator-runtime "^0.13.4" - "@babel/template@^7.12.13", "@babel/template@^7.3.3": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" @@ -903,24 +311,24 @@ "@babel/parser" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz#cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef" - integrity sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b" + integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.14.0" - "@babel/helper-function-name" "^7.12.13" + "@babel/generator" "^7.14.2" + "@babel/helper-function-name" "^7.14.2" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.14.0" - "@babel/types" "^7.14.0" + "@babel/parser" "^7.14.2" + "@babel/types" "^7.14.2" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.14.1" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db" - integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA== +"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3" + integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw== dependencies: "@babel/helper-validator-identifier" "^7.14.0" to-fast-properties "^2.0.0" @@ -938,6 +346,143 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@commitlint/cli@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-12.1.4.tgz#af4d9dd3c0122c7b39a61fa1cd2abbad0422dbe0" + integrity sha512-ZR1WjXLvqEffYyBPT0XdnSxtt3Ty1TMoujEtseW5o3vPnkA1UNashAMjQVg/oELqfaiAMnDw8SERPMN0e/0kLg== + dependencies: + "@commitlint/format" "^12.1.4" + "@commitlint/lint" "^12.1.4" + "@commitlint/load" "^12.1.4" + "@commitlint/read" "^12.1.4" + "@commitlint/types" "^12.1.4" + lodash "^4.17.19" + resolve-from "5.0.0" + resolve-global "1.0.0" + yargs "^16.2.0" + +"@commitlint/config-conventional@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-12.1.4.tgz#95bbab622f117a8a3e49f95917b08655040c66a8" + integrity sha512-ZIdzmdy4o4WyqywMEpprRCrehjCSQrHkaRTVZV411GyLigFQHlEBSJITAihLAWe88Qy/8SyoIe5uKvAsV5vRqQ== + dependencies: + conventional-changelog-conventionalcommits "^4.3.1" + +"@commitlint/ensure@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-12.1.4.tgz#287ae2dcc5ccb086e749705b1bd9bdb99773056f" + integrity sha512-MxHIBuAG9M4xl33qUfIeMSasbv3ktK0W+iygldBxZOL4QSYC2Gn66pZAQMnV9o3V+sVFHoAK2XUKqBAYrgbEqw== + dependencies: + "@commitlint/types" "^12.1.4" + lodash "^4.17.19" + +"@commitlint/execute-rule@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-12.1.4.tgz#9973b02e9779adbf1522ae9ac207a4815ec73de1" + integrity sha512-h2S1j8SXyNeABb27q2Ok2vD1WfxJiXvOttKuRA9Or7LN6OQoC/KtT3844CIhhWNteNMu/wE0gkTqGxDVAnJiHg== + +"@commitlint/format@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-12.1.4.tgz#db2d46418a6ae57c90e5f7f65dff46f0265d9f24" + integrity sha512-h28ucMaoRjVvvgS6Bdf85fa/+ZZ/iu1aeWGCpURnQV7/rrVjkhNSjZwGlCOUd5kDV1EnZ5XdI7L18SUpRjs26g== + dependencies: + "@commitlint/types" "^12.1.4" + chalk "^4.0.0" + +"@commitlint/is-ignored@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-12.1.4.tgz#4c430bc3b361aa9be5cd4ddb252c1559870ea7bc" + integrity sha512-uTu2jQU2SKvtIRVLOzMQo3KxDtO+iJ1p0olmncwrqy4AfPLgwoyCP2CiULq5M7xpR3+dE3hBlZXbZTQbD7ycIw== + dependencies: + "@commitlint/types" "^12.1.4" + semver "7.3.5" + +"@commitlint/lint@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-12.1.4.tgz#856b7fd2b2e6367b836cb84a12f1c1b3c0e40d22" + integrity sha512-1kZ8YDp4to47oIPFELUFGLiLumtPNKJigPFDuHt2+f3Q3IKdQ0uk53n3CPl4uoyso/Og/EZvb1mXjFR/Yce4cA== + dependencies: + "@commitlint/is-ignored" "^12.1.4" + "@commitlint/parse" "^12.1.4" + "@commitlint/rules" "^12.1.4" + "@commitlint/types" "^12.1.4" + +"@commitlint/load@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-12.1.4.tgz#e3c2dbc0e7d8d928f57a6878bd7219909fc0acab" + integrity sha512-Keszi0IOjRzKfxT+qES/n+KZyLrxy79RQz8wWgssCboYjKEp+wC+fLCgbiMCYjI5k31CIzIOq/16J7Ycr0C0EA== + dependencies: + "@commitlint/execute-rule" "^12.1.4" + "@commitlint/resolve-extends" "^12.1.4" + "@commitlint/types" "^12.1.4" + chalk "^4.0.0" + cosmiconfig "^7.0.0" + lodash "^4.17.19" + resolve-from "^5.0.0" + +"@commitlint/message@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-12.1.4.tgz#3895edcc0709deca5945f3d55f5ea95a9f1f446d" + integrity sha512-6QhalEKsKQ/Y16/cTk5NH4iByz26fqws2ub+AinHPtM7Io0jy4e3rym9iE+TkEqiqWZlUigZnTwbPvRJeSUBaA== + +"@commitlint/parse@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-12.1.4.tgz#ba03d54d24ef84f6fd2ff31c5e9998b22d7d0aa1" + integrity sha512-yqKSAsK2V4X/HaLb/yYdrzs6oD/G48Ilt0EJ2Mp6RJeWYxG14w/Out6JrneWnr/cpzemyN5hExOg6+TB19H/Lw== + dependencies: + "@commitlint/types" "^12.1.4" + conventional-changelog-angular "^5.0.11" + conventional-commits-parser "^3.0.0" + +"@commitlint/read@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-12.1.4.tgz#552fda42ef185d5b578beb6f626a5f8b282de3a6" + integrity sha512-TnPQSJgD8Aod5Xeo9W4SaYKRZmIahukjcCWJ2s5zb3ZYSmj6C85YD9cR5vlRyrZjj78ItLUV/X4FMWWVIS38Jg== + dependencies: + "@commitlint/top-level" "^12.1.4" + "@commitlint/types" "^12.1.4" + fs-extra "^9.0.0" + git-raw-commits "^2.0.0" + +"@commitlint/resolve-extends@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-12.1.4.tgz#e758ed7dcdf942618b9f603a7c28a640f6a0802a" + integrity sha512-R9CoUtsXLd6KSCfsZly04grsH6JVnWFmVtWgWs1KdDpdV+G3TSs37tColMFqglpkx3dsWu8dsPD56+D9YnJfqg== + dependencies: + import-fresh "^3.0.0" + lodash "^4.17.19" + resolve-from "^5.0.0" + resolve-global "^1.0.0" + +"@commitlint/rules@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-12.1.4.tgz#0e141b08caa3d7bdc48aa784baa8baff3efd64db" + integrity sha512-W8m6ZSjg7RuIsIfzQiFHa48X5mcPXeKT9yjBxVmjHvYfS2FDBf1VxCQ7vO0JTVIdV4ohjZ0eKg/wxxUuZHJAZg== + dependencies: + "@commitlint/ensure" "^12.1.4" + "@commitlint/message" "^12.1.4" + "@commitlint/to-lines" "^12.1.4" + "@commitlint/types" "^12.1.4" + +"@commitlint/to-lines@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-12.1.4.tgz#caa582dbf121f377a0588bb64e25c4854843cd25" + integrity sha512-TParumvbi8bdx3EdLXz2MaX+e15ZgoCqNUgqHsRLwyqLUTRbqCVkzrfadG1UcMQk8/d5aMbb327ZKG3Q4BRorw== + +"@commitlint/top-level@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-12.1.4.tgz#96d5c715bfc1bdf86dfcf11b67fc2cf7658c7a6e" + integrity sha512-d4lTJrOT/dXlpY+NIt4CUl77ciEzYeNVc0VFgUQ6VA+b1rqYD2/VWFjBlWVOrklxtSDeKyuEhs36RGrppEFAvg== + dependencies: + find-up "^5.0.0" + +"@commitlint/types@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-12.1.4.tgz#9618a5dc8991fb58e6de6ed89d7bf712fa74ba7e" + integrity sha512-KRIjdnWNUx6ywz+SJvjmNCbQKcKP6KArhjZhY2l+CWKxak0d77SOjggkMwFTiSgLODOwmuLTbarR2ZfWPiPMlw== + dependencies: + chalk "^4.0.0" + "@eslint/eslintrc@^0.4.1": version "0.4.1" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14" @@ -1194,14 +739,6 @@ is-module "^1.0.0" resolve "^1.19.0" -"@rollup/plugin-typescript@^8.2.1": - version "8.2.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.2.1.tgz#f1a32d4030cc83432ce36a80a922280f0f0b5d44" - integrity sha512-Qd2E1pleDR4bwyFxqbjt4eJf+wB0UKVMLc7/BAFDGVdAXQMCsD4DUv5/7/ww47BZCYxWtJqe1Lo0KVNswBJlRw== - dependencies: - "@rollup/pluginutils" "^3.1.0" - resolve "^1.17.0" - "@rollup/pluginutils@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" @@ -1211,6 +748,21 @@ estree-walker "^1.0.1" picomatch "^2.2.2" +"@rollup/pluginutils@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.1.0.tgz#0dcc61c780e39257554feb7f77207dceca13c838" + integrity sha512-TrBhfJkFxA+ER+ew2U2/fHbebhLT/l/2pRk0hfj9KusXUuRXd2v0R58AfaZK9VXDQ4TogOSEmICVrQAA3zFnHQ== + dependencies: + estree-walker "^2.0.1" + picomatch "^2.2.2" + +"@samverschueren/stream-to-observable@^0.3.0": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301" + integrity sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ== + dependencies: + any-observable "^0.3.0" + "@sinonjs/commons@^1.7.0": version "1.8.3" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" @@ -1307,16 +859,26 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== +"@types/minimist@^1.2.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256" + integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg== + "@types/node@*": - version "15.0.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" - integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== + version "15.3.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.3.0.tgz#d6fed7d6bc6854306da3dea1af9f874b00783e26" + integrity sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ== "@types/normalize-package-data@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + "@types/prettier@^2.0.0": version "2.2.3" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0" @@ -1347,12 +909,12 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.1.tgz#6bcdbaa4548553ab861b4e5f34936ead1349a543" - integrity sha512-kVTAghWDDhsvQ602tHBc6WmQkdaYbkcTwZu+7l24jtJiYvm9l+/y/b2BZANEezxPDiX5MK2ZecE+9BFi/YJryw== + version "4.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.24.0.tgz#03801ffc25b2af9d08f3dc9bccfc0b7ce3780d0f" + integrity sha512-qbCgkPM7DWTsYQGjx9RTuQGswi+bEt0isqDBeo+CKV0953zqI0Tp7CZ7Fi9ipgFA6mcQqF4NOVNwS/f2r6xShw== dependencies: - "@typescript-eslint/experimental-utils" "4.22.1" - "@typescript-eslint/scope-manager" "4.22.1" + "@typescript-eslint/experimental-utils" "4.24.0" + "@typescript-eslint/scope-manager" "4.24.0" debug "^4.1.1" functional-red-black-tree "^1.0.1" lodash "^4.17.15" @@ -1360,62 +922,70 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.1.tgz#3938a5c89b27dc9a39b5de63a62ab1623ab27497" - integrity sha512-svYlHecSMCQGDO2qN1v477ax/IDQwWhc7PRBiwAdAMJE7GXk5stF4Z9R/8wbRkuX/5e9dHqbIWxjeOjckK3wLQ== +"@typescript-eslint/experimental-utils@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.24.0.tgz#c23ead9de44b99c3a5fd925c33a106b00165e172" + integrity sha512-IwTT2VNDKH1h8RZseMH4CcYBz6lTvRoOLDuuqNZZoThvfHEhOiZPQCow+5El3PtyxJ1iDr6UXZwYtE3yZQjhcw== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.22.1" - "@typescript-eslint/types" "4.22.1" - "@typescript-eslint/typescript-estree" "4.22.1" + "@typescript-eslint/scope-manager" "4.24.0" + "@typescript-eslint/types" "4.24.0" + "@typescript-eslint/typescript-estree" "4.24.0" eslint-scope "^5.0.0" eslint-utils "^2.0.0" "@typescript-eslint/parser@^4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.1.tgz#a95bda0fd01d994a15fc3e99dc984294f25c19cc" - integrity sha512-l+sUJFInWhuMxA6rtirzjooh8cM/AATAe3amvIkqKFeMzkn85V+eLzb1RyuXkHak4dLfYzOmF6DXPyflJvjQnw== + version "4.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.24.0.tgz#2e5f1cc78ffefe43bfac7e5659309a92b09a51bd" + integrity sha512-dj1ZIh/4QKeECLb2f/QjRwMmDArcwc2WorWPRlB8UNTZlY1KpTVsbX7e3ZZdphfRw29aTFUSNuGB8w9X5sS97w== dependencies: - "@typescript-eslint/scope-manager" "4.22.1" - "@typescript-eslint/types" "4.22.1" - "@typescript-eslint/typescript-estree" "4.22.1" + "@typescript-eslint/scope-manager" "4.24.0" + "@typescript-eslint/types" "4.24.0" + "@typescript-eslint/typescript-estree" "4.24.0" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.1.tgz#5bb357f94f9cd8b94e6be43dd637eb73b8f355b4" - integrity sha512-d5bAiPBiessSmNi8Amq/RuLslvcumxLmyhf1/Xa9IuaoFJ0YtshlJKxhlbY7l2JdEk3wS0EnmnfeJWSvADOe0g== +"@typescript-eslint/scope-manager@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.24.0.tgz#38088216f0eaf235fa30ed8cabf6948ec734f359" + integrity sha512-9+WYJGDnuC9VtYLqBhcSuM7du75fyCS/ypC8c5g7Sdw7pGL4NDTbeH38eJPfzIydCHZDoOgjloxSAA3+4l/zsA== dependencies: - "@typescript-eslint/types" "4.22.1" - "@typescript-eslint/visitor-keys" "4.22.1" + "@typescript-eslint/types" "4.24.0" + "@typescript-eslint/visitor-keys" "4.24.0" -"@typescript-eslint/types@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.1.tgz#bf99c6cec0b4a23d53a61894816927f2adad856a" - integrity sha512-2HTkbkdAeI3OOcWbqA8hWf/7z9c6gkmnWNGz0dKSLYLWywUlkOAQ2XcjhlKLj5xBFDf8FgAOF5aQbnLRvgNbCw== +"@typescript-eslint/types@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.24.0.tgz#6d0cca2048cbda4e265e0c4db9c2a62aaad8228c" + integrity sha512-tkZUBgDQKdvfs8L47LaqxojKDE+mIUmOzdz7r+u+U54l3GDkTpEbQ1Jp3cNqqAU9vMUCBA1fitsIhm7yN0vx9Q== -"@typescript-eslint/typescript-estree@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.1.tgz#dca379eead8cdfd4edc04805e83af6d148c164f9" - integrity sha512-p3We0pAPacT+onSGM+sPR+M9CblVqdA9F1JEdIqRVlxK5Qth4ochXQgIyb9daBomyQKAXbygxp1aXQRV0GC79A== +"@typescript-eslint/typescript-estree@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.24.0.tgz#b49249679a98014d8b03e8d4b70864b950e3c90f" + integrity sha512-kBDitL/by/HK7g8CYLT7aKpAwlR8doshfWz8d71j97n5kUa5caHWvY0RvEUEanL/EqBJoANev8Xc/mQ6LLwXGA== dependencies: - "@typescript-eslint/types" "4.22.1" - "@typescript-eslint/visitor-keys" "4.22.1" + "@typescript-eslint/types" "4.24.0" + "@typescript-eslint/visitor-keys" "4.24.0" debug "^4.1.1" globby "^11.0.1" is-glob "^4.0.1" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.1.tgz#6045ae25a11662c671f90b3a403d682dfca0b7a6" - integrity sha512-WPkOrIRm+WCLZxXQHCi+WG8T2MMTUFR70rWjdWYddLT7cEfb2P4a3O/J2U1FBVsSFTocXLCoXWY6MZGejeStvQ== +"@typescript-eslint/visitor-keys@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.24.0.tgz#a8fafdc76cad4e04a681a945fbbac4e35e98e297" + integrity sha512-4ox1sjmGHIxjEDBnMCtWFFhErXtKA1Ec0sBpuz0fqf3P+g3JFGyTxxbF06byw0FRsPnnbq44cKivH7Ks1/0s6g== dependencies: - "@typescript-eslint/types" "4.22.1" + "@typescript-eslint/types" "4.24.0" eslint-visitor-keys "^2.0.0" +JSONStream@^1.0.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + abab@^2.0.3, abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" @@ -1460,9 +1030,9 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4: uri-js "^4.2.2" ajv@^8.0.1: - version "8.2.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602" - integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA== + version "8.4.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.4.0.tgz#48984fdb2ce225cab15795f0772a8d85669075e4" + integrity sha512-7QD2l6+KBSLwf+7MuYocbWvRPdOu63/trReTLu2KFwkgctnub1auoF+Y1WYcm09CTM7quuscrzqmASaLHC/K4Q== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -1474,6 +1044,11 @@ ansi-colors@^4.1.1: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== +ansi-escapes@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" + integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== + ansi-escapes@^4.2.1: version "4.3.2" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" @@ -1481,11 +1056,26 @@ ansi-escapes@^4.2.1: dependencies: type-fest "^0.21.3" +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + ansi-regex@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -1500,6 +1090,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" +any-observable@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" + integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog== + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -1543,6 +1138,11 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= +array-ify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" + integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4= + array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -1553,6 +1153,11 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= +arrify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= + asn1@~0.2.3: version "0.2.4" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" @@ -1580,6 +1185,11 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + atob@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" @@ -1609,13 +1219,6 @@ babel-jest@^26.6.3: graceful-fs "^4.2.4" slash "^3.0.0" -babel-plugin-dynamic-import-node@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" - integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== - dependencies: - object.assign "^4.1.0" - babel-plugin-istanbul@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" @@ -1637,30 +1240,6 @@ babel-plugin-jest-hoist@^26.6.2: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-plugin-polyfill-corejs2@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz#686775bf9a5aa757e10520903675e3889caeedc4" - integrity sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg== - dependencies: - "@babel/compat-data" "^7.13.11" - "@babel/helper-define-polyfill-provider" "^0.2.0" - semver "^6.1.1" - -babel-plugin-polyfill-corejs3@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz#f4b4bb7b19329827df36ff56f6e6d367026cb7a2" - integrity sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.0" - core-js-compat "^3.9.1" - -babel-plugin-polyfill-regenerator@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz#853f5f5716f4691d98c84f8069c7636ea8da7ab8" - integrity sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.0" - babel-preset-current-node-syntax@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" @@ -1748,7 +1327,7 @@ 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== -browserslist@^4.14.5, browserslist@^4.16.6: +browserslist@^4.14.5: version "4.16.6" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== @@ -1791,19 +1370,20 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" -call-bind@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== +camelcase-keys@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" + integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg== + dependencies: + camelcase "^5.3.1" + map-obj "^4.0.0" + quick-lru "^4.0.1" + camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" @@ -1815,9 +1395,9 @@ camelcase@^6.0.0: integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== caniuse-lite@^1.0.30001219: - version "1.0.30001223" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz#39b49ff0bfb3ee3587000d2f66c47addc6e14443" - integrity sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA== + version "1.0.30001228" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa" + integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A== capture-exit@^2.0.0: version "2.0.0" @@ -1831,7 +1411,18 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@^2.0.0: +chalk@^1.0.0, chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1840,6 +1431,14 @@ chalk@^2.0.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chalk@^4.0.0: version "4.1.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" @@ -1873,6 +1472,21 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" +cli-cursor@^2.0.0, cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= + dependencies: + restore-cursor "^2.0.0" + +cli-truncate@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574" + integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ= + dependencies: + slice-ansi "0.0.4" + string-width "^1.0.1" + cliui@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" @@ -1882,11 +1496,25 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -1936,16 +1564,24 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +commander@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" + integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +compare-func@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3" + integrity sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA== + dependencies: + array-ify "^1.0.0" + dot-prop "^5.1.0" + component-emitter@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" @@ -1956,6 +1592,36 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= +conventional-changelog-angular@^5.0.11: + version "5.0.12" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz#c979b8b921cbfe26402eb3da5bbfda02d865a2b9" + integrity sha512-5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw== + dependencies: + compare-func "^2.0.0" + q "^1.5.1" + +conventional-changelog-conventionalcommits@^4.3.1: + version "4.6.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.0.tgz#7fc17211dbca160acf24687bd2fdd5fd767750eb" + integrity sha512-sj9tj3z5cnHaSJCYObA9nISf7eq/YjscLPoq6nmew4SiOjxqL2KRpK20fjnjVbpNDjJ2HR3MoVcWKXwbVvzS0A== + dependencies: + compare-func "^2.0.0" + lodash "^4.17.15" + q "^1.5.1" + +conventional-commits-parser@^3.0.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.1.tgz#ba44f0b3b6588da2ee9fd8da508ebff50d116ce2" + integrity sha512-OG9kQtmMZBJD/32NEw5IhN5+HnBqVjy03eC+I71I0oQRFA5rOgA4OtPOYG7mz1GkCfCNxn3gKIX8EiHJYuf1cA== + dependencies: + JSONStream "^1.0.4" + is-text-path "^1.0.1" + lodash "^4.17.15" + meow "^8.0.0" + split2 "^3.0.0" + through2 "^4.0.0" + trim-off-newlines "^1.0.0" + convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" @@ -1968,19 +1634,33 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.9.0, core-js-compat@^3.9.1: - version "3.12.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.1.tgz#2c302c4708505fa7072b0adb5156d26f7801a18b" - integrity sha512-i6h5qODpw6EsHAoIdQhKoZdWn+dGBF3dSS8m5tif36RlWvW3A6+yu2S16QHUo3CrkzrnEskMAt9f8FxmY9fhWQ== - dependencies: - browserslist "^4.16.6" - semver "7.0.0" - core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +cosmiconfig@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.7.2" + +cosmiconfig@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3" + integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" + create-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" @@ -2023,6 +1703,11 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" +dargs@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" + integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg== + dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -2039,6 +1724,11 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" +date-fns@^1.27.2: + version "1.30.1" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" + integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== + debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -2053,7 +1743,15 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: dependencies: ms "2.1.2" -decamelize@^1.2.0: +decamelize-keys@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" + integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= + dependencies: + decamelize "^1.1.0" + map-obj "^1.0.0" + +decamelize@^1.1.0, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -2068,6 +1766,11 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= +dedent@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" + integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= + deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -2078,13 +1781,6 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - dependencies: - object-keys "^1.0.12" - define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" @@ -2148,6 +1844,13 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" +dot-prop@^5.1.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -2157,9 +1860,14 @@ ecc-jsbn@~0.1.1: safer-buffer "^2.1.0" electron-to-chromium@^1.3.723: - version "1.3.727" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf" - integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg== + version "1.3.731" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.731.tgz#9f17f7e16f798eaddb21409d80aa755b5b5053dc" + integrity sha512-dn1Nyd0DuFa3xhqZJr6/L9phyk+YXJpvrz6Vcu6mFxFqr5TQ9r/F3yvOYFUrEwY4Tbb1YBjN19TDKnSVCQvalA== + +elegant-spinner@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" + integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= emittery@^0.7.1: version "0.7.2" @@ -2197,7 +1905,7 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= @@ -2358,6 +2066,22 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89" + integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.0" + onetime "^5.1.0" + p-finally "^2.0.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + execa@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" @@ -2488,6 +2212,21 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" +figures@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" + integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= + dependencies: + escape-string-regexp "^1.0.5" + object-assign "^4.1.0" + +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= + dependencies: + escape-string-regexp "^1.0.5" + file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -2512,6 +2251,15 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" +find-cache-dir@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" + integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== + dependencies: + commondir "^1.0.1" + make-dir "^3.0.2" + pkg-dir "^4.1.0" + find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -2520,6 +2268,14 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -2559,6 +2315,25 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" +fs-extra@8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-extra@^9.0.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -2584,19 +2359,15 @@ 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@^2.0.1: +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" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" +get-own-enumerable-property-symbols@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== get-package-type@^0.1.0: version "0.1.0" @@ -2629,6 +2400,17 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +git-raw-commits@^2.0.0: + version "2.0.10" + resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.10.tgz#e2255ed9563b1c9c3ea6bd05806410290297bbc1" + integrity sha512-sHhX5lsbG9SOO6yXdlwgEMQ/ljIn7qMpAbJZCGfXX2fq5T8M5SrDnpYk9/4HswTildcIqatsWa91vty6VhWSaQ== + dependencies: + dargs "^7.0.0" + lodash "^4.17.15" + meow "^8.0.0" + split2 "^3.0.0" + through2 "^4.0.0" + glob-parent@^5.0.0, glob-parent@^5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" @@ -2648,6 +2430,13 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" +global-dirs@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" + integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU= + dependencies: + ini "^1.3.4" + globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -2679,7 +2468,7 @@ globby@^11.0.1: merge2 "^1.3.0" slash "^3.0.0" -graceful-fs@^4.2.4: +graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: version "4.2.6" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== @@ -2702,6 +2491,18 @@ har-validator@~5.1.3: ajv "^6.12.3" har-schema "^2.0.0" +hard-rejection@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" + integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -2712,11 +2513,6 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-symbols@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== - has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -2760,6 +2556,13 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== +hosted-git-info@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" + integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + dependencies: + lru-cache "^6.0.0" + html-encoding-sniffer@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" @@ -2786,6 +2589,11 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== +husky@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e" + integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ== + iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -2803,7 +2611,7 @@ ignore@^5.1.4: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== -import-fresh@^3.0.0, import-fresh@^3.2.1: +import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -2824,6 +2632,16 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= +indent-string@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" + integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -2832,11 +2650,16 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2: +inherits@2, inherits@^2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +ini@^1.3.4: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -2869,9 +2692,9 @@ is-ci@^2.0.0: ci-info "^2.0.0" is-core-module@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" - integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== + version "2.4.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" + integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== dependencies: has "^1.0.3" @@ -2929,6 +2752,18 @@ is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -2963,6 +2798,28 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== +is-obj@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= + +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +is-observable@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e" + integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA== + dependencies: + symbol-observable "^1.1.0" + +is-plain-obj@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= + is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -2975,6 +2832,11 @@ is-potential-custom-element-name@^1.0.0: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== +is-promise@^2.1.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" + integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== + is-reference@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7" @@ -2982,6 +2844,11 @@ is-reference@^1.2.1: dependencies: "@types/estree" "*" +is-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= + is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -2992,6 +2859,13 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== +is-text-path@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e" + integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4= + dependencies: + text-extensions "^1.0.0" + is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -3432,7 +3306,7 @@ jest-watcher@^26.6.2: jest-util "^26.6.2" string-length "^4.0.1" -jest-worker@^26.2.1, jest-worker@^26.6.2: +jest-worker@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== @@ -3505,11 +3379,6 @@ jsesc@^2.5.1: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= - json-parse-even-better-errors@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" @@ -3547,6 +3416,27 @@ json5@^2.1.2: dependencies: minimist "^1.2.5" +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +jsonparse@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" + integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -3576,7 +3466,7 @@ kind-of@^5.0.0: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -kind-of@^6.0.0, kind-of@^6.0.2: +kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -3612,6 +3502,68 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= +lint-staged@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.0.0.tgz#2560394062b6e0be77247761bba5fde26025fb89" + integrity sha512-/MrZOLMnljjMHakxlRd1Z5Kr8wWWlrWFasye7HaTv5tx56icwzT/STRty8flMKsyzBGTfTa9QszNVPsDS/yOug== + dependencies: + chalk "^3.0.0" + commander "^4.0.1" + cosmiconfig "^6.0.0" + debug "^4.1.1" + dedent "^0.7.0" + execa "^3.4.0" + listr "^0.14.3" + log-symbols "^3.0.0" + micromatch "^4.0.2" + normalize-path "^3.0.0" + please-upgrade-node "^3.2.0" + stringify-object "^3.3.0" + +listr-silent-renderer@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e" + integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4= + +listr-update-renderer@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2" + integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA== + dependencies: + chalk "^1.1.3" + cli-truncate "^0.2.1" + elegant-spinner "^1.0.1" + figures "^1.7.0" + indent-string "^3.0.0" + log-symbols "^1.0.2" + log-update "^2.3.0" + strip-ansi "^3.0.1" + +listr-verbose-renderer@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db" + integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw== + dependencies: + chalk "^2.4.1" + cli-cursor "^2.1.0" + date-fns "^1.27.2" + figures "^2.0.0" + +listr@^0.14.3: + version "0.14.3" + resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586" + integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA== + dependencies: + "@samverschueren/stream-to-observable" "^0.3.0" + is-observable "^1.1.0" + is-promise "^2.1.0" + is-stream "^1.1.0" + listr-silent-renderer "^1.1.1" + listr-update-renderer "^0.5.0" + listr-verbose-renderer "^0.5.0" + p-map "^2.0.0" + rxjs "^6.3.3" + locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -3619,16 +3571,18 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= - lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" @@ -3639,6 +3593,29 @@ lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== +log-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" + integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg= + dependencies: + chalk "^1.0.0" + +log-symbols@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4" + integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ== + dependencies: + chalk "^2.4.2" + +log-update@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708" + integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg= + dependencies: + ansi-escapes "^3.0.0" + cli-cursor "^2.0.0" + wrap-ansi "^3.0.1" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -3653,7 +3630,7 @@ magic-string@^0.25.7: dependencies: sourcemap-codec "^1.4.4" -make-dir@^3.0.0: +make-dir@^3.0.0, make-dir@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== @@ -3677,6 +3654,16 @@ map-cache@^0.2.2: resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= +map-obj@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= + +map-obj@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz#e4ea399dbc979ae735c83c863dd31bdf364277b7" + integrity sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ== + map-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" @@ -3684,6 +3671,23 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" +meow@^8.0.0: + version "8.1.2" + resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897" + integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q== + dependencies: + "@types/minimist" "^1.2.0" + camelcase-keys "^6.2.2" + decamelize-keys "^1.1.0" + hard-rejection "^2.1.0" + minimist-options "4.1.0" + normalize-package-data "^3.0.0" + read-pkg-up "^7.0.1" + redent "^3.0.0" + trim-newlines "^3.0.0" + type-fest "^0.18.0" + yargs-parser "^20.2.3" + merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -3733,11 +3737,21 @@ mime-types@^2.1.12, mime-types@~2.1.19: dependencies: mime-db "1.47.0" +mimic-fn@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" + integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== + mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +min-indent@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" + integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== + minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -3745,6 +3759,15 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" +minimist-options@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" + integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== + dependencies: + arrify "^1.0.1" + is-plain-obj "^1.1.0" + kind-of "^6.0.3" + minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" @@ -3818,9 +3841,9 @@ node-notifier@^8.0.0: which "^2.0.2" node-releases@^1.1.71: - version "1.1.71" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" - integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== + version "1.1.72" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe" + integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw== normalize-package-data@^2.5.0: version "2.5.0" @@ -3832,6 +3855,16 @@ normalize-package-data@^2.5.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-package-data@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699" + integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg== + dependencies: + hosted-git-info "^4.0.1" + resolve "^1.20.0" + semver "^7.3.4" + validate-npm-package-license "^3.0.1" + normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -3858,6 +3891,11 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + nwsapi@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" @@ -3868,6 +3906,11 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + object-copy@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" @@ -3877,11 +3920,6 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-keys@^1.0.12, object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" @@ -3889,16 +3927,6 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" - object-keys "^1.1.1" - object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" @@ -3913,6 +3941,13 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= + dependencies: + mimic-fn "^1.0.0" + onetime@^5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" @@ -3954,6 +3989,11 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= +p-finally@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" + integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== + p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -3961,6 +4001,13 @@ p-limit@^2.2.0: dependencies: p-try "^2.0.0" +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -3968,6 +4015,18 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + +p-map@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" + integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== + p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -4047,13 +4106,20 @@ pirates@^4.0.1: dependencies: node-modules-regexp "^1.0.0" -pkg-dir@^4.2.0: +pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== dependencies: find-up "^4.0.0" +please-upgrade-node@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" + integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== + dependencies: + semver-compare "^1.0.0" + posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -4115,6 +4181,11 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== +q@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= + qs@~6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" @@ -4125,12 +4196,10 @@ queue-microtask@^1.2.2: resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" +quick-lru@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" + integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== react-is@^17.0.1: version "17.0.2" @@ -4156,29 +4225,22 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -regenerate-unicode-properties@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" - integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== +readable-stream@3, readable-stream@^3.0.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== dependencies: - regenerate "^1.4.0" + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" -regenerate@^1.4.0: - version "1.4.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" - integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== - -regenerator-runtime@^0.13.4: - version "0.13.7" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" - integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== - -regenerator-transform@^0.14.2: - version "0.14.5" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" - integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== +redent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" + integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== dependencies: - "@babel/runtime" "^7.8.4" + indent-string "^4.0.0" + strip-indent "^3.0.0" regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" @@ -4193,30 +4255,6 @@ regexpp@^3.0.0, regexpp@^3.1.0: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== -regexpu-core@^4.7.1: - version "4.7.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" - integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ== - dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^8.2.0" - regjsgen "^0.5.1" - regjsparser "^0.6.4" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.2.0" - -regjsgen@^0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" - integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== - -regjsparser@^0.6.4: - version "0.6.9" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6" - integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ== - dependencies: - jsesc "~0.5.0" - remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -4296,22 +4334,29 @@ resolve-cwd@^3.0.0: dependencies: resolve-from "^5.0.0" +resolve-from@5.0.0, resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== +resolve-global@1.0.0, resolve-global@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-global/-/resolve-global-1.0.0.tgz#a2a79df4af2ca3f49bf77ef9ddacd322dad19255" + integrity sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw== + dependencies: + global-dirs "^0.1.1" resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0: +resolve@1.20.0, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -4319,6 +4364,14 @@ resolve@^1.10.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.1 is-core-module "^2.2.0" path-parse "^1.0.6" +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" @@ -4336,20 +4389,21 @@ rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" -rollup-plugin-terser@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d" - integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ== +rollup-plugin-typescript2@^0.30.0: + version "0.30.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.30.0.tgz#1cc99ac2309bf4b9d0a3ebdbc2002aecd56083d3" + integrity sha512-NUFszIQyhgDdhRS9ya/VEmsnpTe+GERDMmFo0Y+kf8ds51Xy57nPNGglJY+W6x1vcouA7Au7nsTgsLFj2I0PxQ== dependencies: - "@babel/code-frame" "^7.10.4" - jest-worker "^26.2.1" - serialize-javascript "^4.0.0" - terser "^5.0.0" + "@rollup/pluginutils" "^4.1.0" + find-cache-dir "^3.3.1" + fs-extra "8.1.0" + resolve "1.20.0" + tslib "2.1.0" rollup@^2.47.0: - version "2.47.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.47.0.tgz#9d958aeb2c0f6a383cacc0401dff02b6e252664d" - integrity sha512-rqBjgq9hQfW0vRmz+0S062ORRNJXvwRpzxhFXORvar/maZqY6za3rgQ/p1Glg+j1hnc1GtYyQCPiAei95uTElg== + version "2.48.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.48.0.tgz#fceb01ed771f991f29f7bd2ff7838146e55acb74" + integrity sha512-wl9ZSSSsi5579oscSDYSzGn092tCS076YB+TQrzsGuSfYyJeep8eEWj0eaRjuC5McuMNmcnR8icBqiE/FWNB1A== optionalDependencies: fsevents "~2.3.1" @@ -4365,7 +4419,14 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2: +rxjs@^6.3.3: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== + dependencies: + tslib "^1.9.0" + +safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -4409,34 +4470,27 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + "semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.2.1, semver@^7.3.2: +semver@7.3.5, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" -serialize-javascript@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" - integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== - dependencies: - randombytes "^2.1.0" +semver@^6.0.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== set-blocking@^2.0.0: version "2.0.0" @@ -4497,6 +4551,11 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +slice-ansi@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" + integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= + slice-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" @@ -4547,7 +4606,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.19: +source-map-support@^0.5.17, source-map-support@^0.5.6: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== @@ -4570,7 +4629,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.7.3, source-map@~0.7.2: +source-map@^0.7.3: version "0.7.3" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== @@ -4602,9 +4661,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.7" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" - integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== + version "3.0.8" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.8.tgz#eb1e97ad99b11bf3f82a3b71a0472dd9a00f2ecf" + integrity sha512-NDgA96EnaLSvtbM7trJj+t1LUR3pirkDCcz9nOUlPb5DMBGsH7oES6C3hs3j7R9oHEa1EMvReS/BUAIT5Tcr0g== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -4613,6 +4672,13 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" +split2@^3.0.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" + integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== + dependencies: + readable-stream "^3.0.0" + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -4661,6 +4727,23 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +string-width@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + string-width@^4.1.0, string-width@^4.2.0: version "4.2.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" @@ -4670,6 +4753,36 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +stringify-object@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== + dependencies: + get-own-enumerable-property-symbols "^3.0.0" + is-obj "^1.0.1" + is-regexp "^1.0.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + strip-ansi@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" @@ -4692,11 +4805,23 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== +strip-indent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" + integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== + dependencies: + min-indent "^1.0.0" + strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -4719,15 +4844,20 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" +symbol-observable@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== table@^6.0.4: - version "6.7.0" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.0.tgz#26274751f0ee099c547f6cb91d3eff0d61d155b2" - integrity sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw== + version "6.7.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" + integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== dependencies: ajv "^8.0.1" lodash.clonedeep "^4.5.0" @@ -4744,15 +4874,6 @@ terminal-link@^2.0.0: ansi-escapes "^4.2.1" supports-hyperlinks "^2.0.0" -terser@^5.0.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693" - integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g== - dependencies: - commander "^2.20.0" - source-map "~0.7.2" - source-map-support "~0.5.19" - test-exclude@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" @@ -4762,6 +4883,11 @@ test-exclude@^6.0.0: glob "^7.1.4" minimatch "^3.0.4" +text-extensions@^1.0.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26" + integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ== + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -4772,6 +4898,18 @@ throat@^5.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== +through2@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" + integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw== + dependencies: + readable-stream "3" + +"through@>=2.2.7 <3": + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + tmpl@1.0.x: version "1.0.4" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" @@ -4838,6 +4976,16 @@ tr46@^2.0.2: dependencies: punycode "^2.1.1" +trim-newlines@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30" + integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA== + +trim-off-newlines@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3" + integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM= + ts-node@^9.1.1: version "9.1.1" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" @@ -4850,11 +4998,21 @@ ts-node@^9.1.1: source-map-support "^0.5.17" yn "3.1.1" -tslib@^1.8.1: +tslib@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== + +tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" + integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== + tsutils@^3.17.1: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" @@ -4893,6 +5051,11 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== +type-fest@^0.18.0: + version "0.18.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" + integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== + type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" @@ -4925,29 +5088,6 @@ typescript@^4.2.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961" integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg== -unicode-canonical-property-names-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" - integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== - -unicode-match-property-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" - integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== - dependencies: - unicode-canonical-property-names-ecmascript "^1.0.4" - unicode-property-aliases-ecmascript "^1.0.4" - -unicode-match-property-value-ecmascript@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" - integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== - -unicode-property-aliases-ecmascript@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" - integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== - union-value@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" @@ -4958,11 +5098,16 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^2.0.1" -universalify@^0.1.2: +universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== + unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" @@ -4988,6 +5133,11 @@ use@^3.1.0: resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== +util-deprecate@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" @@ -5105,6 +5255,14 @@ word-wrap@^1.2.3, word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +wrap-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba" + integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= + dependencies: + string-width "^2.1.1" + strip-ansi "^4.0.0" + wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -5114,6 +5272,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -5149,11 +5316,21 @@ y18n@^4.0.0: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== +yaml@^1.10.0, yaml@^1.7.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + yargs-parser@^18.1.2: version "18.1.3" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" @@ -5162,6 +5339,11 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^20.2.2, yargs-parser@^20.2.3: + version "20.2.7" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" + integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== + yargs@^15.4.1: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" @@ -5179,7 +5361,25 @@ yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" +yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==